summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
AgeCommit message (Expand)AuthorFilesLines
2015-12-08Merge branch 'jk/rebase-no-autostash' into maintLibravatar Junio C Hamano1-1/+2
2015-10-16Merge branch 'mm/keyid-docs' into maintLibravatar Junio C Hamano1-1/+3
2015-09-21Documentation: explain optional arguments betterLibravatar Matthieu Moy1-1/+3
2015-09-10Documentation/git-rebase: fix --no-autostash formattingLibravatar John Keeping1-1/+2
2015-08-03Merge branch 'gr/rebase-i-drop-warn'Libravatar Junio C Hamano1-0/+9
2015-06-30git rebase -i: warn about removed commitsLibravatar Galan Rémi1-0/+6
2015-06-30git-rebase -i: add command "drop" to remove a commitLibravatar Galan Rémi1-0/+3
2015-06-15git-rebase--interactive.sh: add config option for custom instruction formatLibravatar Michael Rappazzo1-0/+7
2015-05-22Merge branch 'jk/asciidoc-markup-fix'Libravatar Junio C Hamano1-1/+1
2015-05-12doc: fix misrendering due to `single quote'Libravatar Jeff King1-1/+1
2015-03-31Sync with 2.3.5Libravatar Junio C Hamano1-1/+3
2015-03-31Merge branch 'ss/pull-rebase-preserve' into maintLibravatar Junio C Hamano1-1/+3
2015-03-30docs: clarify what git-rebase's "-p" / "--preserve-merges" doesLibravatar Sebastian Schuberth1-1/+3
2015-03-13*config.txt: stick to camelCase naming conventionLibravatar Nguyễn Thái Ngọc Duy1-3/+3
2014-10-14Merge branch 'so/rebase-doc-fork-point'Libravatar Junio C Hamano1-12/+19
2014-09-29Documentation/git-rebase.txt: document when --fork-point is auto-enabledLibravatar Sergey Organov1-12/+19
2014-09-16Documentation/git-rebase.txt: <upstream> must be given to specify <branch>Libravatar Sergey Organov1-1/+1
2014-08-12Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-opLibravatar Sergey Organov1-5/+2
2014-02-11rebase: add the --gpg-sign optionLibravatar Nicolas Vigier1-0/+4
2013-12-10rebase: use reflog to find common base with upstreamLibravatar John Keeping1-0/+10
2013-09-06Documentation: make AsciiDoc links always point to HTML filesLibravatar Sebastian Schuberth1-2/+2
2013-06-27rebase -i: handle fixup! fixup! in --autosquashLibravatar Andrew Pimlott1-1/+3
2013-05-29rebase: implement --[no-]autostash and rebase.autostashLibravatar Ramkumar Ramachandra1-0/+10
2013-02-01Documentation: the name of the system is 'Git', not 'git'Libravatar Thomas Ackermann1-1/+1
2012-09-17rebase -i: Teach "--edit-todo" actionLibravatar Andrew Wong1-1/+4
2012-07-23Merge branch 'sn/doc-typofix'Libravatar Junio C Hamano1-1/+1
2012-07-15Merge branch 'cw/rebase-i-root'Libravatar Junio C Hamano1-4/+5
2012-07-14doc: A few minor copy edits.Libravatar Štěpán Němec1-1/+1
2012-06-26rebase -i: support --root without --ontoLibravatar Chris Webb1-4/+5
2012-06-13rebase -i: teach "--exec <cmd>"Libravatar Lucien Kong1-3/+42
2012-05-02Merge branch 'jk/doc-asciidoc-inline-literal'Libravatar Junio C Hamano1-5/+5
2012-04-26docs: stop using asciidoc no-inline-literalLibravatar Jeff King1-5/+5
2012-04-24git-rebase: add keep_empty flagLibravatar Neil Horman1-0/+4
2012-03-26documentation: fix alphabetic ordered list for git-rebase man pageLibravatar Nelson Benitez Leon1-2/+5
2011-07-22Merge branch 'mz/doc-rebase-abort'Libravatar Junio C Hamano1-2/+6
2011-07-13rebase: clarify "restore the original branch"Libravatar Martin von Zweigbergk1-2/+6
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsLibravatar Martin von Zweigbergk1-1/+0
2011-04-28Merge branch 'mz/rebase'Libravatar Junio C Hamano1-2/+9
2011-03-15Merge branch 'jk/doc-credits' of git://github.com/peff/gitLibravatar Junio C Hamano1-10/+0
2011-03-14Documentation: "rebase <onto> <that>" stays on <that> branch upon exitLibravatar Drew Northup1-2/+3
2011-03-11doc: drop author/documentation sections from most pagesLibravatar Jeff King1-10/+0
2011-02-10rebase: use @{upstream} if no upstream specifiedLibravatar Martin von Zweigbergk1-2/+9
2010-11-23rebase: support --verifyLibravatar Martin von Zweigbergk1-0/+4
2010-09-03Merge branch 'jn/doc-backslash'Libravatar Junio C Hamano1-1/+1
2010-08-31Merge branch 'hv/autosquash-config'Libravatar Junio C Hamano1-0/+8
2010-08-21Merge branch 'mm/rebase-i-exec'Libravatar Junio C Hamano1-0/+24
2010-08-20Documentation: do not convert ... operator to ellipsesLibravatar Jonathan Nieder1-1/+1
2010-08-11rebase -i: add exec command to launch a shell commandLibravatar Matthieu Moy1-0/+24
2010-08-03rebase: support -X to pass through strategy optionsLibravatar Mike Lundy1-0/+7
2010-07-14add configuration variable for --autosquash option of interactive rebaseLibravatar Heiko Voigt1-0/+8