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 /Documentation/git-svn.txt | |
| parent | git-svn: add support for --first-parent (diff) | |
| download | tgif-4dbfe2e9bdfdde2d3257194573cee0d41471592b.tar.xz | |
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 'Documentation/git-svn.txt')
| -rw-r--r-- | Documentation/git-svn.txt | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 42d7b82a37..be2e34eb8f 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -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 |