Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'pw/doc-synopsis-markup-opmode-options' | Junio C Hamano | 2019-07-09 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | show --continue/skip etc. consistently in synopsis | Phillip Wood | 2019-06-17 | 1 | -1/+1 | |
* | | | Merge branch 'js/rebase-deprecate-preserve-merges' | Junio C Hamano | 2019-05-30 | 1 | -2/+3 | |
|\ \ \ | ||||||
| * | | | rebase docs: recommend `-r` over `-p` | Johannes Schindelin | 2019-05-28 | 1 | -2/+3 | |
* | | | | Merge branch 'pw/rerere-autoupdate' | Junio C Hamano | 2019-04-16 | 1 | -0/+5 | |
|\ \ \ \ | ||||||
| * | | | | am/cherry-pick/rebase/revert: document --rerere-autoupdate | Phillip Wood | 2019-03-18 | 1 | -0/+5 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge branch 'js/rebase-deprecate-preserve-merges' | Junio C Hamano | 2019-04-10 | 1 | -11/+12 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | rebase: deprecate --preserve-merges | Johannes Schindelin | 2019-03-12 | 1 | -11/+12 | |
| |/ | ||||||
* | | Merge branch 'js/rebase-recreate-merge' | Junio C Hamano | 2019-03-11 | 1 | -1/+1 | |
|\ \ | |/ |/| | ||||||
| * | rebase docs: fix "gitlink" typo | Kyle Meyer | 2019-03-01 | 1 | -1/+1 | |
* | | Merge branch 'ea/rebase-compat-doc-fix' | Junio C Hamano | 2019-02-14 | 1 | -1/+0 | |
|\ \ | ||||||
| * | | docs/git-rebase: remove redundant entry in incompatible options list | Emilio Cobos Álvarez | 2019-02-14 | 1 | -1/+0 | |
* | | | Merge branch 'en/rebase-merge-on-sequencer' | Junio C Hamano | 2019-02-14 | 1 | -2/+0 | |
|\ \ \ | ||||||
| * | | | git-rebase.txt: update to reflect merge now implemented on sequencer | Elijah Newren | 2019-02-14 | 1 | -2/+0 | |
* | | | | Merge branch 'js/rebase-i-redo-exec-fix' | Junio C Hamano | 2019-02-08 | 1 | -6/+0 | |
|\ \ \ \ | ||||||
| * | | | | Revert "rebase: introduce a shortcut for --reschedule-failed-exec" | Johannes Schindelin | 2019-02-06 | 1 | -6/+0 | |
* | | | | | Merge branch 'en/rebase-merge-on-sequencer' | Junio C Hamano | 2019-02-06 | 1 | -14/+3 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | rebase: implement --merge via the interactive machinery | Elijah Newren | 2019-01-07 | 1 | -14/+3 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'js/rebase-i-redo-exec' | Junio C Hamano | 2019-01-29 | 1 | -0/+11 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | rebase: introduce a shortcut for --reschedule-failed-exec | Johannes Schindelin | 2018-12-11 | 1 | -0/+6 | |
| * | | | rebase: introduce --reschedule-failed-exec | Johannes Schindelin | 2018-12-11 | 1 | -0/+5 | |
| |/ / | ||||||
* | | | Merge branch 'en/directory-renames-nothanks-doc-update' | Junio C Hamano | 2019-01-14 | 1 | -2/+3 | |
|\ \ \ | ||||||
| * | | | git-rebase.txt: update note about directory rename detection and am | Elijah Newren | 2018-12-09 | 1 | -2/+3 | |
| |/ / | ||||||
* | | | Merge branch 'km/rebase-doc-typofix' | Junio C Hamano | 2019-01-14 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | rebase docs: drop stray word in merge command description | Kyle Meyer | 2018-12-10 | 1 | -1/+1 | |
* | | | Merge branch 'en/rebase-consistency' | Junio C Hamano | 2018-12-04 | 1 | -13/+17 | |
|\ \ \ | ||||||
| * | | | rebase docs: fix incorrect format of the section Behavioral Differences | Johannes Sixt | 2018-12-04 | 1 | -13/+17 | |
* | | | | Merge branch 'nd/config-split' | Junio C Hamano | 2018-11-13 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | config.txt: move rebase-config.txt to config/ | Nguyễn Thái Ngọc Duy | 2018-10-29 | 1 | -1/+1 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'js/rebase-i-break' | Junio C Hamano | 2018-11-02 | 1 | -1/+5 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | rebase -i: introduce the 'break' command | Johannes Schindelin | 2018-10-12 | 1 | -0/+3 | |
| * | | | rebase -i: clarify what happens on a failed `exec` | Johannes Schindelin | 2018-10-11 | 1 | -1/+2 | |
* | | | | docs: typo: s/isimilar/similar/ | Michael Witten | 2018-10-07 | 1 | -1/+1 | |
* | | | | Merge branch 'js/rebase-merge-octopus' | Junio C Hamano | 2018-08-02 | 1 | -3/+4 | |
|\ \ \ \ | ||||||
| * | | | | rebase --rebase-merges: adjust man page for octopus support | Johannes Schindelin | 2018-07-11 | 1 | -3/+4 | |
* | | | | | Merge branch 'en/rebase-consistency' | Junio C Hamano | 2018-07-24 | 1 | -27/+108 | |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | ||||||
| * | | | git-rebase: make --allow-empty-message the default | Elijah Newren | 2018-06-27 | 1 | -10/+0 | |
| * | | | git-rebase.txt: document behavioral differences between modes | Elijah Newren | 2018-06-27 | 1 | -0/+32 | |
| * | | | git-rebase.txt: address confusion between --no-ff vs --force-rebase | Elijah Newren | 2018-06-27 | 1 | -20/+10 | |
| * | | | git-rebase.txt: document incompatible options | Elijah Newren | 2018-06-26 | 1 | -8/+77 | |
| |/ / | ||||||
* | | | Merge branch 'js/rebase-recreate-merge' | Junio C Hamano | 2018-07-18 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | rebase: fix documentation formatting | Vladimir Parfinenko | 2018-06-27 | 1 | -1/+1 | |
* | | Use proper syntax for replaceables in command docs | Robert P. J. Day | 2018-05-25 | 1 | -2/+2 | |
|/ | ||||||
* | rebase -i --rebase-merges: add a section to the man page | Johannes Schindelin | 2018-04-26 | 1 | -0/+135 | |
* | rebase -i: introduce --rebase-merges=[no-]rebase-cousins | Johannes Schindelin | 2018-04-26 | 1 | -4/+11 | |
* | rebase: introduce the --rebase-merges option | Johannes Schindelin | 2018-04-26 | 1 | -1/+20 | |
* | Merge branch 'pw/rebase-signoff' | Junio C Hamano | 2018-04-25 | 1 | -3/+4 | |
|\ | ||||||
| * | rebase: extend --signoff support | Phillip Wood | 2018-03-29 | 1 | -3/+4 | |
* | | Merge branch 'nd/rebase-show-current-patch' | Junio C Hamano | 2018-03-06 | 1 | -1/+6 | |
|\ \ | ||||||
| * | | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -1/+2 |