diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-07-27 15:14:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-27 15:14:21 -0700 |
| commit | 3dcacd7797082cb8e6f3c10970e18dd843433e3a (patch) | |
| tree | 5dce98361218d7d04b7d3cced3170fb14e5cca63 /git-rebase--interactive.sh | |
| parent | Merge branch 'cc/replace-graft' (diff) | |
| parent | rebase: omit patch-identical commits with --fork-point (diff) | |
| download | tgif-3dcacd7797082cb8e6f3c10970e18dd843433e3a.tar.xz | |
Merge branch 'jk/rebase-am-fork-point'
"git rebase --fork-point" did not filter out patch-identical
commits correctly.
* jk/rebase-am-fork-point:
rebase: omit patch-identical commits with --fork-point
rebase--am: use --cherry-pick instead of --ignore-if-in-upstream
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 7e1eda0088..b64dd28acf 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -963,7 +963,7 @@ else fi git rev-list $merges_option --pretty=oneline --abbrev-commit \ --abbrev=7 --reverse --left-right --topo-order \ - $revisions | \ + $revisions ${restrict_revision+^$restrict_revision} | \ sed -n "s/^>//p" | while read -r shortsha1 rest do |