summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * rebase: clarify "restore the original branch"Martin von Zweigbergk2011-07-131-2/+6
* | Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk2011-07-061-1/+0
|/
* Merge branch 'mz/rebase'Junio C Hamano2011-04-281-2/+9
|\
| * rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-101-2/+9
* | Merge branch 'jk/doc-credits' of git://github.com/peff/gitJunio C Hamano2011-03-151-10/+0
|\ \
| * | doc: drop author/documentation sections from most pagesJeff King2011-03-111-10/+0
| |/
* | Documentation: "rebase <onto> <that>" stays on <that> branch upon exitDrew Northup2011-03-141-2/+3
|/
* rebase: support --verifyMartin von Zweigbergk2010-11-231-0/+4
* Merge branch 'jn/doc-backslash'Junio C Hamano2010-09-031-1/+1
|\
| * Documentation: do not convert ... operator to ellipsesJonathan Nieder2010-08-201-1/+1
* | Merge branch 'hv/autosquash-config'Junio C Hamano2010-08-311-0/+8
|\ \
| * | add configuration variable for --autosquash option of interactive rebaseHeiko Voigt2010-07-141-0/+8
* | | Merge branch 'mm/rebase-i-exec'Junio C Hamano2010-08-211-0/+24
|\ \ \ | |_|/ |/| |
| * | rebase -i: add exec command to launch a shell commandMatthieu Moy2010-08-111-0/+24
| |/
* | rebase: support -X to pass through strategy optionsMike Lundy2010-08-031-0/+7
|/
* rebase -i -p: document shortcomingsJonathan Nieder2010-06-111-0/+27
* Documentation: A...B shortcut for checkout and rebaseMichael J Gruber2010-06-021-0/+4
* Documentation: rebase -i ignores options passed to "git am"Markus Heidelberg2010-05-181-0/+1
* Teach rebase the --no-ff option.Marc Branchaud2010-03-241-2/+21
View Lorry Controller Status