Junio C Hamano 2c18e6ae24 Merge branch 'js/rebase-recreate-merge' ... "git rebase" learned "--rebase-merges" to transplant the whole topology of commit graph elsewhere. * js/rebase-recreate-merge: rebase -i --rebase-merges: add a section to the man page rebase -i: introduce --rebase-merges=[no-]rebase-cousins pull: accept --rebase=merges to recreate the branch topology rebase --rebase-merges: avoid "empty merges" sequencer: handle post-rewrite for merge commands sequencer: make refs generated by the `label` command worktree-local rebase --rebase-merges: add test for --keep-empty rebase: introduce the --rebase-merges option rebase-helper --make-script: introduce a flag to rebase merges sequencer: fast-forward `merge` commands, if possible sequencer: introduce the `merge` command sequencer: introduce new commands to reset the revision git-rebase--interactive: clarify arguments sequencer: offer helpful advice when a command was rescheduled sequencer: refactor how original todo list lines are accessed sequencer: make rearrange_squash() a bit more obvious sequencer: avoid using errno clobbered by rollback_lock_file()		2018-05-23 14:38:20 +09:00
..
.gitattributes	completion: mark bash script as LF-only	2017-05-10 13:32:51 +09:00
git-completion.bash	Merge branch 'js/rebase-recreate-merge'	2018-05-23 14:38:20 +09:00
git-completion.tcsh	git-completion.tcsh: fix redirect with noclobber	2015-06-09 11:21:15 -07:00
git-completion.zsh	completion: fill COMPREPLY directly when completing refs	2017-03-23 11:18:22 -07:00
git-prompt.sh	git-prompt: fix reading files with windows line endings	2017-12-06 10:08:13 -08:00