diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:43:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:43:00 -0700 |
| commit | d6d561db1c0a14e8b89149694c0c662096c5fc9d (patch) | |
| tree | d0180fa78b9b0c5d4c03e843686cdffcac8647e2 /builtin/commit-tree.c | |
| parent | Merge branch 'en/rebase-no-keep-empty' (diff) | |
| parent | rebase --merge: optionally skip upstreamed commits (diff) | |
| download | git-d6d561db1c0a14e8b89149694c0c662096c5fc9d.tar.gz git-d6d561db1c0a14e8b89149694c0c662096c5fc9d.zip | |
Merge branch 'jt/rebase-allow-duplicate'
Allow "git rebase" to reapply all local commits, even if the may be
already in the upstream, without checking first.
* jt/rebase-allow-duplicate:
rebase --merge: optionally skip upstreamed commits
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions