summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-031-7/+9
|\
| * rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-271-7/+9
* | treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-1/+1
|/
* Merge branch 'ks/fix-rebase-doc-picture'Junio C Hamano2017-07-121-1/+1
|\
| * doc: correct a mistake in an illustrationks/fix-rebase-doc-pictureKaartic Sivaraam2017-07-101-1/+1
| * Merge branch 'mm/doc-tt' into maintJunio C Hamano2016-07-281-5/+5
| |\
* | | stash: update documentation to use 'stash entry'Liam Beguin2017-06-181-1/+1
* | | Merge branch 'gb/rebase-signoff'Junio C Hamano2017-04-261-0/+5
|\ \ \
| * | | rebase: pass --[no-]signoff option to git amgb/rebase-signoffGiuseppe Bilotta2017-04-181-0/+5
* | | | Merge branch 'nd/rebase-forget'Junio C Hamano2016-12-191-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | rebase: add --quit to cleanup rebase, leave everything else untouchednd/rebase-forgetNguyễn Thái Ngọc Duy2016-12-111-1/+6
* | | | Merge branch 'mm/doc-tt'Junio C Hamano2016-07-131-5/+5
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | doc: typeset long command-line options as literalMatthieu Moy2016-06-281-5/+5
| |/
* | rebase: decouple --exec from --interactiveStefan Beller2016-03-181-3/+3
|/
* Documentation: reword rebase summarysb/rebase-summaryStefan Beller2016-03-021-1/+1
* Merge branch 'mm/keyid-docs'Junio C Hamano2015-10-051-1/+3
|\
| * Documentation: explain optional arguments bettermm/keyid-docsMatthieu Moy2015-09-211-1/+3
* | Merge branch 'jk/rebase-no-autostash'Junio C Hamano2015-10-051-1/+2
|\ \
| * | Documentation/git-rebase: fix --no-autostash formattingjk/rebase-no-autostashJohn Keeping2015-09-101-1/+2
* | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-08-031-0/+9
|\ \ \
| * | | git rebase -i: warn about removed commitsGalan Rémi2015-06-301-0/+6
| * | | git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-301-0/+3
| | |/ | |/|
* | | git-rebase--interactive.sh: add config option for custom instruction formatmr/rebase-i-customize-insn-sheetMichael Rappazzo2015-06-151-0/+7
|/ /
* | Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano2015-05-221-1/+1
|\ \
| * | doc: fix misrendering due to `single quote'Jeff King2015-05-121-1/+1
* | | Sync with 2.3.5Junio C Hamano2015-03-311-1/+3
|\ \ \ | |/ /
| * | Merge branch 'ss/pull-rebase-preserve' into maintJunio C Hamano2015-03-311-1/+3
| |\ \ | | |/ | |/|
| | * docs: clarify what git-rebase's "-p" / "--preserve-merges" doesss/pull-rebase-preserveSebastian Schuberth2015-03-301-1/+3
* | | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCaseNguyễn Thái Ngọc Duy2015-03-131-3/+3
|/ /
* | Merge branch 'so/rebase-doc-fork-point'Junio C Hamano2014-10-141-12/+19
|\ \
| * | Documentation/git-rebase.txt: document when --fork-point is auto-enabledso/rebase-doc-fork-pointSergey Organov2014-09-291-12/+19
* | | Documentation/git-rebase.txt: <upstream> must be given to specify <branch>so/rebase-docSergey Organov2014-09-161-1/+1
* | | Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-opSergey Organov2014-08-121-5/+2
| |/ |/|
* | rebase: add the --gpg-sign optionNicolas Vigier2014-02-111-0/+4
|/
* rebase: use reflog to find common base with upstreamJohn Keeping2013-12-101-0/+10
* Documentation: make AsciiDoc links always point to HTML filesss/doclinksSebastian Schuberth2013-09-061-2/+2
* rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott2013-06-271-1/+3
* rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra2013-05-291-0/+10
* Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-1/+1
* rebase -i: Teach "--edit-todo" actionAndrew Wong2012-09-171-1/+4
* Merge branch 'sn/doc-typofix'Junio C Hamano2012-07-231-1/+1
|\
| * doc: A few minor copy edits.Štěpán Němec2012-07-141-1/+1
* | Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-151-4/+5
|\ \ | |/ |/|
| * rebase -i: support --root without --ontoChris Webb2012-06-261-4/+5
* | rebase -i: teach "--exec <cmd>"Lucien Kong2012-06-131-3/+42
|/
* Merge branch 'jk/doc-asciidoc-inline-literal'Junio C Hamano2012-05-021-5/+5
|\
| * docs: stop using asciidoc no-inline-literalJeff King2012-04-261-5/+5
* | git-rebase: add keep_empty flagNeil Horman2012-04-241-0/+4
|/
* documentation: fix alphabetic ordered list for git-rebase man pageNelson Benitez Leon2012-03-261-2/+5
* Merge branch 'mz/doc-rebase-abort'Junio C Hamano2011-07-221-2/+6
|\
View Lorry Controller Status