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 /t/t6031-merge-recursive.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 't/t6031-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions