]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c7d8f69 0fcb4f6)
Merge branch 'jt/rebase-allow-duplicate'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:43:00 +0000 (13:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:43:00 +0000 (13:43 -0700)
commitd6d561db1c0a14e8b89149694c0c662096c5fc9d
treed0180fa78b9b0c5d4c03e843686cdffcac8647e2tree | snapshot
parentc7d8f69da5443788950b823bd6b9b663e1e686a3commit | diff
parent0fcb4f6b62c87a73971890070dea847b56176338commit | diff
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
Documentation/git-rebase.txt diff1 | diff2 | blob | history
builtin/rebase.c diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
sequencer.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.