summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
Commit message (Expand)AuthorAgeFilesLines
* 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
* git-rebase.txt: Fix spellingHorst H. von Brand2010-01-211-1/+1
* Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-201-19/+19
|\
| * Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-101-19/+19
* | rebase -i --autosquash: auto-squash commitsNanako Shiraishi2010-01-061-0/+10
* | Add a command "fixup" to rebase --interactiveMichael Haggerty2009-12-071-5/+8
|/
* Merge branch 'tr/maint-merge-ours-clarification' (early part)Junio C Hamano2009-11-221-3/+13
|\
| * rebase docs: clarify --merge and --strategyThomas Rast2009-11-161-3/+13
* | Teach 'rebase -i' the command "reword"Björn Gustavsson2009-10-071-3/+6
|/
* git apply: option to ignore whitespace differencesGiuseppe Bilotta2009-08-051-1/+2
* am, rebase: teach quiet optionStephen Boyd2009-06-181-0/+4
* doc/git-rebase.txt: remove mention of multiple strategiesNguyễn Thái Ngọc Duy2009-05-211-2/+1
* rebase: add options passed to git-amMichele Ballabio2009-03-181-0/+5
* document --force-rebaseMichele Ballabio2009-03-181-0/+7
* git-rebase: Add --stat and --no-stat for producing diffstat on rebaseTor Arne Vestbø2009-03-021-1/+16
* git-rebase: Update --whitespace documentationTodd Zullinger2009-02-281-1/+1
* git-rebase.txt: --interactive does not work with --whitespaceMark Burton2009-02-121-0/+1
* rebase: update documentation for --rootThomas Rast2009-01-111-5/+16
* Merge branch 'tr/workflow-doc'Junio C Hamano2008-10-191-5/+125
|\
| * Documentation: new upstream rebase recovery section in git-rebaseThomas Rast2008-09-151-5/+125
* | Merge branch 'ae/preservemerge'Junio C Hamano2008-10-191-2/+1
|\ \
| * | rebase: Support preserving merges in non-interactive modeAndreas Ericsson2008-09-301-2/+1
* | | rebase: Document --no-verify option to bypass pre-rebase hookNanako Shiraishi2008-10-141-1/+4
|/ /
* | Fixed some grammatical errors in git-rebase.txt documentation.Garry Dolley2008-09-241-4/+4
|/
* Rename .git/rebase to .git/rebase-applyJohannes Schindelin2008-07-211-2/+2
* Update my e-mail addressJunio C Hamano2008-07-211-1/+1
* Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-151-1/+1
* Documentation: mention ORIG_HEAD in am, merge, and rebaseBrian Gernhardt2008-07-081-1/+2
* manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-051-13/+13
* Documentation: more "git-" versus "git " changesJonathan Nieder2008-07-051-2/+2
* Documentation formatting and cleanupJonathan Nieder2008-07-011-11/+11