aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
Commit message (Expand)AuthorAge
* Documentation: move rebase.* configs to new fileLiam Beguin2017-12-04
* Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-03
|\
| * rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-27
* | treewide: correct several "up-to-date" to "up to date"Martin Ågren2017-08-23
|/
* Merge branch 'ks/fix-rebase-doc-picture'Junio C Hamano2017-07-12
|\
| * doc: correct a mistake in an illustrationKaartic Sivaraam2017-07-10
| * Merge branch 'mm/doc-tt' into maintJunio C Hamano2016-07-28
| |\
* | | stash: update documentation to use 'stash entry'Liam Beguin2017-06-18
* | | Merge branch 'gb/rebase-signoff'Junio C Hamano2017-04-26
|\ \ \
| * | | rebase: pass --[no-]signoff option to git amGiuseppe Bilotta2017-04-18
* | | | Merge branch 'nd/rebase-forget'Junio C Hamano2016-12-19
|\ \ \ \ | |/ / / |/| | |
| * | | rebase: add --quit to cleanup rebase, leave everything else untouchedNguyễn Thái Ngọc Duy2016-12-11
* | | | Merge branch 'mm/doc-tt'Junio C Hamano2016-07-13
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | doc: typeset long command-line options as literalMatthieu Moy2016-06-28
| |/
* | rebase: decouple --exec from --interactiveStefan Beller2016-03-18
|/
* Documentation: reword rebase summaryStefan Beller2016-03-02
* Merge branch 'mm/keyid-docs'Junio C Hamano2015-10-05
|\
| * Documentation: explain optional arguments betterMatthieu Moy2015-09-21
* | Merge branch 'jk/rebase-no-autostash'Junio C Hamano2015-10-05
|\ \
| * | Documentation/git-rebase: fix --no-autostash formattingJohn Keeping2015-09-10
* | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-08-03
|\ \ \
| * | | git rebase -i: warn about removed commitsGalan Rémi2015-06-30
| * | | git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-30
| | |/ | |/|
* | | git-rebase--interactive.sh: add config option for custom instruction formatMichael Rappazzo2015-06-15
|/ /
* | Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano2015-05-22
|\ \
| * | doc: fix misrendering due to `single quote'Jeff King2015-05-12
* | | Sync with 2.3.5Junio C Hamano2015-03-31
|\ \ \ | |/ /
| * | Merge branch 'ss/pull-rebase-preserve' into maintJunio C Hamano2015-03-31
| |\ \ | | |/ | |/|
| | * docs: clarify what git-rebase's "-p" / "--preserve-merges" doesSebastian Schuberth2015-03-30
* | | *config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy2015-03-13
|/ /
* | Merge branch 'so/rebase-doc-fork-point'Junio C Hamano2014-10-14
|\ \
| * | Documentation/git-rebase.txt: document when --fork-point is auto-enabledSergey Organov2014-09-29
* | | Documentation/git-rebase.txt: <upstream> must be given to specify <branch>Sergey Organov2014-09-16
* | | Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-opSergey Organov2014-08-12
| |/ |/|
* | rebase: add the --gpg-sign optionNicolas Vigier2014-02-11
|/
* rebase: use reflog to find common base with upstreamJohn Keeping2013-12-10
* Documentation: make AsciiDoc links always point to HTML filesSebastian Schuberth2013-09-06
* rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott2013-06-27
* rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra2013-05-29
* Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-01
* rebase -i: Teach "--edit-todo" actionAndrew Wong2012-09-17
* Merge branch 'sn/doc-typofix'Junio C Hamano2012-07-23
|\
| * doc: A few minor copy edits.Štěpán Němec2012-07-14
* | Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-15
|\ \ | |/ |/|
| * rebase -i: support --root without --ontoChris Webb2012-06-26
* | rebase -i: teach "--exec <cmd>"Lucien Kong2012-06-13
|/
* Merge branch 'jk/doc-asciidoc-inline-literal'Junio C Hamano2012-05-02
|\
| * docs: stop using asciidoc no-inline-literalJeff King2012-04-26
* | git-rebase: add keep_empty flagNeil Horman2012-04-24
|/
* documentation: fix alphabetic ordered list for git-rebase man pageNelson Benitez Leon2012-03-26