I think that the reason for this behaviour is that "rebase --root"
implicitly forces "rebase -i" to run (instead of the 'format-patch
piped to am'), and --committer-date-is-author-date is not supported
by the "rebase -i" codepath at all.
I see Thomas did "rebase --root" support in v1.6.2 era both
Max Kirillov writes:
> My exact case was that there was a change in one branch
> which was overwritten during merge conflict resolution by
> fully acepting the other branch - in a 2-parent merge. I
> started looking for a way to visualize such cases. They
> are not visible in usual diff, because
Max Kirillov writes:
> Looks like there is no exact specification what `diff -c` and
> `diff --cc` should output. Considering this it is not reasonable to
> hardcode any specific output in test.
OK.
> Rather, it should verify that file
> selection behaves the same as hunk selection.
Hrm, reall
On Sat, Apr 11, 2015 at 02:07:25PM -0700, Junio C Hamano wrote:
> Max Kirillov writes:
>
>> If `git diff --cc` is used with 2 or more parents, then it shows
>> all hunks which have changed compared to at least 2 parents.
>> Which is reasonable, because those places are likely places for
>> confli
I am trying to find all the unmerged commits [5].
I can find, as a human, all the commits by git log --oneline --graph --all [1]
but I am looking for a scripted way.
But git show-branch -a --independent misses some [2]
find .git/refs/ -type f -exec cat '{}' ';' | sort -u; finds too much [3].
--
EUREKA HOTEL LONDON HAS EMPLOYMENT OPPORTUNITIES FOR AN EXOTIC
CANDIDATES IN DIFFERENT SKILLS,SEND YOUR CV/RESUME:
dr.davidmo...@ukr.net
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vg
On Sat, Apr 11, 2015 at 2:07 PM, Junio C Hamano wrote:
> Especially, we need to pay close attention to the discussion that
> germinated the current behaviour:
>
> http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15519
>
> I recall that the "diff --cc" before that change was not
Max Kirillov writes:
> If `git diff --cc` is used with 2 or more parents, then it shows
> all hunks which have changed compared to at least 2 parents.
> Which is reasonable, because those places are likely places for
> conflicts, and it should be displayed how they were resolved.
OK.
> But, pre
Max Kirillov writes:
> Signed-off-by: Max Kirillov
> ---
> combine-diff.c | 43 ---
> 1 file changed, 24 insertions(+), 19 deletions(-)
>
> diff --git a/combine-diff.c b/combine-diff.c
> index 8eb7278..a236bb5 100644
> --- a/combine-diff.c
> +++ b/combine
Max Kirillov writes:
> If `git diff --cc` is used with 2 or more parents, then
> it shows all hunks which have changed compared to at least 2 parents.
> Which is reasonable, because those places are likely places for
> conflicts, and it should be displayed how they were resolved.
> But, prelimina
Duy Nguyen writes:
> On Fri, Apr 3, 2015 at 7:01 PM, Jeff King wrote:
>> Aside from the nits above, I did get it to run t1509 with this. I can't
>> say I'm incredibly excited about the whole thing, if only because it is
>> clear that nobody is going to run it regularly (so regressions will
>> li
version:
git version 2.1.4
Linux wolke-w520 3.19.3-towo.1-siduction-amd64 #1 SMP PREEMPT siduction
3.19-9 (2015-03-26) x86_64 GNU/Linux
summary:
if i do `git rebase --committer-date-is-author-date --root', the
committer date is set to now, instead of set to the autho
On 04/11, Erik Elfström wrote:
> Signed-off-by: Erik Elfström
> ---
> t/perf/p7300-clean.sh | 37 +
> 1 file changed, 37 insertions(+)
> create mode 100755 t/perf/p7300-clean.sh
>
> diff --git a/t/perf/p7300-clean.sh b/t/perf/p7300-clean.sh
> new file mode 100
Before this change, clean used resolve_gitlink_ref to check for the
presence of nested git repositories. This had the drawback of creating
a ref_cache entry for every directory that should potentially be
cleaned. The linear search through the ref_cache list caused a massive
performance hit for larg
Signed-off-by: Erik Elfström
---
t/perf/p7300-clean.sh | 37 +
1 file changed, 37 insertions(+)
create mode 100755 t/perf/p7300-clean.sh
diff --git a/t/perf/p7300-clean.sh b/t/perf/p7300-clean.sh
new file mode 100755
index 000..af50d5d
--- /dev/null
+++ b
Signed-off-by: Erik Elfström
---
t/t7300-clean.sh | 72
1 file changed, 72 insertions(+)
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 99be5d9..58e6b4a 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -455,6 +455,78 @@ test
v1 of the patch can be found here:
http://thread.gmane.org/gmane.comp.version-control.git/266839/focus=266839
changes in v2:
* fixed commit message,
"p7300: added performance tests for clean"
change to:
"p7300: add performance tests for clean"
* simplified test code
* removed non portable ls
v1 of the patch can be found here:
http://thread.gmane.org/gmane.comp.version-control.git/266839/focus=266839
changes in v2:
* fixed commit message,
"p7300: added performance tests for clean"
change to:
"p7300: add performance tests for clean"
* simplified test code
* removed non portable ls
Am 10.04.2015 um 13:33 schrieb Konrád Lőrinczi:
I really miss the
git submodule remove
command.
This should be handle all the tasks what are needed to remove a submodule.
- Delete the relevant line from the .gitmodules file.
- Delete the relevant section from .git/config.
- Run
On Wed, Apr 08, 2015 at 01:51:40PM +0200, Michael J Gruber wrote:
> Phillip Susi venit, vidit, dixit 07.04.2015 19:08:
> > On 4/7/2015 10:13 AM, Michael J Gruber wrote:
> >> Seriously: gitk knows F5 and Shift-F5 for refresh, and I think the
> >> latter is the thorougher refreshment.
> >
> > Neith
20 matches
Mail list logo
