global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-09 16:30:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

git-svn: always use --first-parent

Browse Source 
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>
This commit is contained in:
Lars Hjemli
2007-09-07 02:00:08 +02:00
committed by Junio C Hamano
parent 05b4df3153
commit 4dbfe2e9bd
2 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/git-svn.txt
View File

@@ -317,16 +317,6 @@ This is only used with the 'dcommit' command.
Print out the series of git arguments that would show
which diffs would be committed to SVN.
--first-parent::
This is only used with the 'dcommit', 'rebase', 'log', 'find-rev' and
'show-ignore' commands.
These commands tries to detect the upstream subversion branch by means of
the embedded 'git-svn-id' line in commit messages. When --first-parent is
specified, git-svn only follows the first parent of each commit, effectively
ignoring commits brought into the current branch through merge-operations.
--
ADVANCED OPTIONS