diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2007-09-07 02:00:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-06 22:53:16 -0700 |
| commit | 4dbfe2e9bdfdde2d3257194573cee0d41471592b (patch) | |
| tree | b41d909967ed67858f1b76c987a3ee0f81243982 /builtin-merge-file.c | |
| parent | 05b4df31537a653eaa30d2c6f53e05d7a12d1bc8 (diff) | |
| download | git-4dbfe2e9bdfdde2d3257194573cee0d41471592b.tar.gz | |
git-svn: always use --first-parent
This makes git-svn unconditionally invoke git-log with --first-parent when
it is trying to discover its upstream subversion branch and collecting the
commit ids which should be pushed to it with dcommit. The reason for always
using --first-parent is to make git-svn behave in a predictable way when the
ancestry chain contains merges with other git-svn branches.
Since git-svn now always uses 'git-log --first-parent' there is no longer
any need for the --first-parent option to git-svn, so this is removed.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions