aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-rebase.txt
AgeCommit message (Expand)AuthorFilesLines
2012-07-23Merge branch 'sn/doc-typofix'Junio C Hamano1-1/+1
2012-07-15Merge branch 'cw/rebase-i-root'Junio C Hamano1-4/+5
2012-07-14doc: A few minor copy edits.Štěpán Němec1-1/+1
2012-06-26rebase -i: support --root without --ontoChris Webb1-4/+5
2012-06-13rebase -i: teach "--exec <cmd>"Lucien Kong1-3/+42
2012-05-02Merge branch 'jk/doc-asciidoc-inline-literal'Junio C Hamano1-5/+5
2012-04-26docs: stop using asciidoc no-inline-literalJeff King1-5/+5
2012-04-24git-rebase: add keep_empty flagNeil Horman1-0/+4
2012-03-26documentation: fix alphabetic ordered list for git-rebase man pageNelson Benitez Leon1-2/+5
2011-07-22Merge branch 'mz/doc-rebase-abort'Junio C Hamano1-2/+6
2011-07-13rebase: clarify "restore the original branch"Martin von Zweigbergk1-2/+6
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk1-1/+0
2011-04-28Merge branch 'mz/rebase'Junio C Hamano1-2/+9
2011-03-15Merge branch 'jk/doc-credits' of git://github.com/peff/gitJunio C Hamano1-10/+0
2011-03-14Documentation: "rebase <onto> <that>" stays on <that> branch upon exitDrew Northup1-2/+3
2011-03-11doc: drop author/documentation sections from most pagesJeff King1-10/+0
2011-02-10rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk1-2/+9
2010-11-23rebase: support --verifyMartin von Zweigbergk1-0/+4
2010-09-03Merge branch 'jn/doc-backslash'Junio C Hamano1-1/+1
2010-08-31Merge branch 'hv/autosquash-config'Junio C Hamano1-0/+8
2010-08-21Merge branch 'mm/rebase-i-exec'Junio C Hamano1-0/+24
2010-08-20Documentation: do not convert ... operator to ellipsesJonathan Nieder1-1/+1
2010-08-11rebase -i: add exec command to launch a shell commandMatthieu Moy1-0/+24
2010-08-03rebase: support -X to pass through strategy optionsMike Lundy1-0/+7
2010-07-14add configuration variable for --autosquash option of interactive rebaseHeiko Voigt1-0/+8
2010-06-11rebase -i -p: document shortcomingsJonathan Nieder1-0/+27
2010-06-02Documentation: A...B shortcut for checkout and rebaseMichael J Gruber1-0/+4
2010-05-18Documentation: rebase -i ignores options passed to "git am"Markus Heidelberg1-0/+1
2010-03-24Teach rebase the --no-ff option.Marc Branchaud1-2/+21
2010-01-21git-rebase.txt: Fix spellingHorst H. von Brand1-1/+1
2010-01-20Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano1-19/+19
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast1-19/+19
2010-01-06rebase -i --autosquash: auto-squash commitsNanako Shiraishi1-0/+10
2009-12-07Add a command "fixup" to rebase --interactiveMichael Haggerty1-5/+8
2009-11-22Merge branch 'tr/maint-merge-ours-clarification' (early part)Junio C Hamano1-3/+13
2009-11-16rebase docs: clarify --merge and --strategyThomas Rast1-3/+13
2009-10-07Teach 'rebase -i' the command "reword"Björn Gustavsson1-3/+6
2009-08-05git apply: option to ignore whitespace differencesGiuseppe Bilotta1-1/+2
2009-06-18am, rebase: teach quiet optionStephen Boyd1-0/+4
2009-05-21doc/git-rebase.txt: remove mention of multiple strategiesNguyễn Thái Ngọc Duy1-2/+1
2009-03-18rebase: add options passed to git-amMichele Ballabio1-0/+5
2009-03-18document --force-rebaseMichele Ballabio1-0/+7
2009-03-02git-rebase: Add --stat and --no-stat for producing diffstat on rebaseTor Arne Vestbø1-1/+16
2009-02-28git-rebase: Update --whitespace documentationTodd Zullinger1-1/+1
2009-02-12git-rebase.txt: --interactive does not work with --whitespaceMark Burton1-0/+1
2009-01-11rebase: update documentation for --rootThomas Rast1-5/+16
2008-10-19Merge branch 'tr/workflow-doc'Junio C Hamano1-5/+125
2008-10-19Merge branch 'ae/preservemerge'Junio C Hamano1-2/+1
2008-10-14rebase: Document --no-verify option to bypass pre-rebase hookNanako Shiraishi1-1/+4
2008-09-30rebase: Support preserving merges in non-interactive modeAndreas Ericsson1-2/+1
2008-09-24Fixed some grammatical errors in git-rebase.txt documentation.Garry Dolley1-4/+4
2008-09-15Documentation: new upstream rebase recovery section in git-rebaseThomas Rast1-5/+125
2008-07-21Rename .git/rebase to .git/rebase-applyJohannes Schindelin1-2/+2
2008-07-21Update my e-mail addressJunio C Hamano1-1/+1
2008-07-15Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin1-1/+1
2008-07-08Documentation: mention ORIG_HEAD in am, merge, and rebaseBrian Gernhardt1-1/+2
2008-07-05manpages: italicize git command names (which were in teletype font)Jonathan Nieder1-13/+13
2008-07-05Documentation: more "git-" versus "git " changesJonathan Nieder1-2/+2
2008-07-01Documentation formatting and cleanupJonathan Nieder1-11/+11
2008-07-01Documentation: be consistent about "git-" versus "git "Jonathan Nieder1-10/+10
2008-06-08Docs: Use "-l::\n--long\n" format in OPTIONS sectionsStephan Beyer1-5/+10
2008-06-06documentation: move git(7) to git(1)Christian Couder1-1/+1
2008-03-10update 'git rebase' documentationSZEDER Gábor1-2/+1
2008-03-01Documentation/git-rebase.txt: Add --strategy to synopsysMike Hommey1-0/+1
2008-01-06Documentation: rename gitlink macro to linkgitDan McGee1-5/+5
2007-10-16git-rebase: document suppression of duplicate commitsJeff King1-1/+24
2007-09-29Merge branch 'maint'Junio C Hamano1-1/+1
2007-09-29rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin1-1/+1
2007-09-07git-rebase: support --whitespace=<option>J. Bruce Fields1-2/+7
2007-09-01Mention -m as an abbreviation for --mergeRobin Rosenberg1-2/+2
2007-08-31rebase -i: mention the option to split commits in the man pageJohannes Schindelin1-1/+38
2007-08-16Documentation/git-rebase: fix an exampleJunio C Hamano1-1/+1
2007-06-26Teach rebase -i about --preserve-mergesJohannes Schindelin1-1/+22
2007-06-24Teach rebase an interactive modeJohannes Schindelin1-3/+82
2007-06-07War on whitespaceJunio C Hamano1-1/+0
2007-05-18Documentation: Added [verse] to SYNOPSIS where necessaryMatthias Kestenholz1-1/+1
2007-02-17Convert update-index references in docs to add.Shawn O. Pearce1-1/+1
2007-02-17Attempt to improve git-rebase lead-in description.Shawn O. Pearce1-8/+14
2007-02-11Documentation: git-rebase -C<n>Junio C Hamano1-1/+1
2007-02-08add -C[NUM] to git-amMichael S. Tsirkin1-1/+7
2007-02-05Show an example of deleting commits with git-rebase.Shawn O. Pearce1-2/+25
2007-01-18Documentation: sync git.txt command list and manual page titleJunio C Hamano1-1/+1
2006-11-06Merge branch 'maint'Junio C Hamano1-8/+57
2006-11-06Documentation: Transplanting branch with git-rebase --ontoJakub Narebski1-8/+57
2006-10-04git-rebase: Add a -v option to show a diffstat of the changes upstream at the...Robert Shearman1-1/+4
2006-06-25rebase: allow --skip to work with --mergeEric Wong1-1/+0
2006-06-21rebase: Allow merge strategies to be used when rebasingEric Wong1-1/+19
2006-05-14Make git rebase interactive help match documentation.Sean1-6/+5
2006-04-26Add --continue and --abort options to git-rebase.sean1-13/+63
2006-03-26Document git-rebase behavior on conflicts.J. Bruce Fields1-0/+12
2006-03-17Clarify git-rebase example commands.Jon Loeliger1-3/+3
2006-03-09Remove trailing dot after short descriptionFredrik Kuivinen1-1/+1
2006-02-21git-rebase: Clarify usage statement and copy it into the actual documentation.Carl Worth1-2/+42
2005-09-20[PATCH] Documentation: Update all files to use the new gitlink: macroSergey Vlasov1-1/+1
2005-09-07Big tool rename.Junio C Hamano1-0/+35