aboutsummaryrefslogtreecommitdiffstats
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
2014-04-21Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano1-10/+1
2014-04-17Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"Kyle J. McKay1-10/+1
2014-03-28Merge branch 'bg/rebase-off-of-previous-branch'Junio C Hamano1-0/+4
2014-03-19rebase: allow "-" short-hand for the previous branchBrian Gesiak1-0/+4
2014-02-11rebase: add the --gpg-sign optionNicolas Vigier1-0/+11
2014-02-11rebase: parse options in stuck-long modeNicolas Vigier1-28/+22
2014-02-03rebase: don't try to match -M optionNicolas Vigier1-1/+1
2014-02-03rebase: remove useless arguments checkNicolas Vigier1-2/+0
2014-02-03git-sh-setup.sh: add variable to use the stuck-long modeNicolas Vigier1-0/+1
2014-01-09rebase: fix fork-point with zero argumentsJohn Keeping1-1/+2
2013-12-10rebase: use reflog to find common base with upstreamJohn Keeping1-0/+19
2013-09-20Merge branch 'mm/rebase-continue-freebsd-WB'Junio C Hamano1-1/+10
2013-09-09rebase: fix run_specific_rebase's use of "return" on FreeBSDMatthieu Moy1-1/+10
2013-07-31Merge branch 'rr/rebase-autostash'Junio C Hamano1-1/+1
2013-07-29git-rebase: fix typoRalf Thielow1-1/+1
2013-07-18Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano1-2/+6
2013-06-27Merge branch 'rr/rebase-stash-store'Junio C Hamano1-5/+2
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano1-2/+2
2013-06-23rebase: use a better reflog messageRamkumar Ramachandra1-2/+6
2013-06-17rebase: use 'git stash store' to simplify logicRamkumar Ramachandra1-5/+2
2013-06-14rebase: use peel_committish() where appropriateRamkumar Ramachandra1-2/+2
2013-06-13rebase: finish_rebase() in noop rebaseRamkumar Ramachandra1-0/+1
2013-06-13rebase: finish_rebase() in fast-forward rebaseRamkumar Ramachandra1-0/+1
2013-06-13rebase: guard against missing files in read_basic_state()Ramkumar Ramachandra1-0/+2
2013-05-29rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra1-3/+42
2013-05-12rebase: prepare to do generic housekeepingRamkumar Ramachandra1-0/+7
2013-04-26Merge branch 'ph/rebase-original'Junio C Hamano1-1/+1
2013-04-23rebase: find orig_head unambiguouslyPhil Hord1-1/+1
2012-09-17rebase -i: Teach "--edit-todo" actionAndrew Wong1-2/+11
2012-09-17rebase usage: subcommands can not be combined with -iMartin von Zweigbergk1-1/+1
2012-08-01git-rebase.sh: fix typo in an error messageRalf Thielow1-1/+1
2012-07-26rebase: remove obsolete and unused LONG_USAGE which breaks xgettextJiang Xin1-25/+0
2012-07-26i18n: Rewrite gettext messages start with dashJiang Xin1-1/+1
2012-07-25i18n: rebase: mark messages for translationJiang Xin1-30/+34
2012-07-15Merge branch 'cw/rebase-i-root'Junio C Hamano1-2/+12
2012-07-13Merge branch 'mz/rebase-no-mbox'Junio C Hamano1-1/+5
2012-06-26rebase -i: support --root without --ontoChris Webb1-2/+12
2012-06-26rebase --root: print usage on too many argsMartin von Zweigbergk1-1/+5
2012-06-13rebase -i: teach "--exec <cmd>"Lucien Kong1-3/+17
2012-06-01Merge branch 'ef/maint-rebase-error-message'Junio C Hamano1-1/+1
2012-05-30rebase: report invalid commit correctlyErik Faye-Lund1-1/+1
2012-05-29Do not autosquash in case of an implied interactive rebaseVincent van Ravesteijn1-0/+1
2012-04-24git-rebase: add keep_empty flagNeil Horman1-0/+5
2012-03-04Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto1-1/+1
2011-10-17Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano1-1/+1
2011-10-13pull,rebase: handle GIT_WORK_TREE betterJeff King1-1/+1
2011-08-05misc-sh: fix up whitespace in some other .sh files.Jon Seymour1-1/+1
2011-07-22Merge branch 'mz/doc-rebase-abort'Junio C Hamano1-5/+5
2011-07-13rebase: clarify "restore the original branch"Martin von Zweigbergk1-5/+5
2011-07-13Merge branch 'js/rebase-typo-branch-squelch-usage'Junio C Hamano1-2/+1
2011-06-29rebase: do not print lots of usage hints after an obvious error messageJohannes Sixt1-2/+1
2011-05-27rebase: write a reflog entry when finishingJeff King1-1/+3
2011-05-27rebase: create HEAD reflog entry when abortingCsaba Henk1-1/+1
2011-03-04rebase: define options in OPTIONS_SPECMartin von Zweigbergk1-45/+56
2011-02-10rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk1-6/+15
2011-02-10rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk1-0/+4
2011-02-10rebase: remember strategy and strategy optionsMartin von Zweigbergk1-0/+6
2011-02-10rebase: remember verbose optionMartin von Zweigbergk1-2/+4
2011-02-10rebase: extract code for writing basic stateMartin von Zweigbergk1-3/+13
2011-02-10rebase: factor out sub command handlingMartin von Zweigbergk1-2/+15
2011-02-10rebase: make -v a tiny bit more verboseMartin von Zweigbergk1-2/+16
2011-02-10rebase: extract am code to new source fileMartin von Zweigbergk1-29/+2
2011-02-10rebase: extract merge code to new source fileMartin von Zweigbergk1-151/+11
2011-02-10rebase: remove $branch as synonym for $orig_headMartin von Zweigbergk1-10/+9
2011-02-10rebase: factor out reference parsingMartin von Zweigbergk1-4/+5
2011-02-10rebase -i: support --statMartin von Zweigbergk1-7/+7
2011-02-10rebase: reorder validation stepsMartin von Zweigbergk1-5/+5
2011-02-10rebase: factor out call to pre-rebase hookMartin von Zweigbergk1-5/+7
2011-02-10rebase: factor out clean work tree checkMartin von Zweigbergk1-2/+2
2011-02-10rebase: factor out command line option processingMartin von Zweigbergk1-20/+38
2011-02-10rebase: align variable contentMartin von Zweigbergk1-1/+3
2011-02-10rebase: align variable namesMartin von Zweigbergk1-16/+16
2011-02-10rebase: stricter check of standalone sub commandMartin von Zweigbergk1-2/+2
2011-02-10rebase: act on command line outside parsing loopMartin von Zweigbergk1-60/+66
2011-02-10rebase: improve detection of rebase in progressMartin von Zweigbergk1-39/+41
2011-02-10rebase: remove unused rebase state 'prev_head'Martin von Zweigbergk1-8/+0
2011-02-10rebase: read state outside loopMartin von Zweigbergk1-2/+2
2011-02-10rebase: refactor reading of stateMartin von Zweigbergk1-30/+23
2011-02-10rebase: clearer names for directory variablesMartin von Zweigbergk1-70/+71
2011-01-27Merge branch 'maint'Junio C Hamano1-1/+2
2011-01-26rebase: give a better error message for bogus branchJeff King1-0/+1
2011-01-26rebase: use explicit "--" with checkoutJeff King1-1/+1
2010-12-14Merge branch 'mz/rebase-abort-reflog-fix' into maintJunio C Hamano1-9/+10
2010-12-14Merge branch 'mz/maint-rebase-stat-config' into maintJunio C Hamano1-1/+2
2010-12-12Merge branch 'mz/rebase-i-verify'Junio C Hamano1-0/+3
2010-12-12Merge branch 'mz/rebase-abort-reflog-fix'Junio C Hamano1-9/+10
2010-12-12Merge branch 'mz/maint-rebase-stat-config'Junio C Hamano1-1/+2
2010-11-29Merge branch 'rr/needs-clean-work-tree'Junio C Hamano1-13/+1
2010-11-29rebase: only show stat if configured to trueMartin von Zweigbergk1-1/+2
2010-11-23rebase --abort: do not update branch refMartin von Zweigbergk1-9/+10
2010-11-23rebase: support --verifyMartin von Zweigbergk1-0/+3
2010-11-10rebase -X: do not clobber strategyMartin von Zweigbergk1-4/+0
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra1-13/+1
2010-10-13shell portability: no "export VAR=VAL"Junio C Hamano1-1/+1
2010-09-15Merge branch 'os/fix-rebase-diff-no-prefix'Junio C Hamano1-0/+1
2010-09-09Add --src/dst-prefix to git-formt-patch in git-rebase.shOded Shimon1-0/+1
2010-08-20Merge branch 'jn/rebase-rename-am' into maintJunio C Hamano1-1/+1
2010-08-18Merge branch 'ml/rebase-x-strategy'Junio C Hamano1-1/+23
2010-08-18Merge branch 'jn/rebase-rename-am'Junio C Hamano1-1/+1
2010-08-09git-rebase: fix typo when parsing --force-rebaseWilly Tarreau1-1/+1
2010-08-03rebase: support -X to pass through strategy optionsMike Lundy1-1/+23
2010-07-28Fix git rebase --continue to work with touched filesDavid D. Kilzer1-0/+1
2010-07-23rebase: protect against diff.renames configurationJunio C Hamano1-1/+1
2010-05-31rebase: improve error message when upstream argument is missingJonathan Nieder1-9/+8
2010-04-03Merge branch 'mb/rebase-i-no-ff'Junio C Hamano1-2/+2
2010-03-24Merge branch 'tr/notes-display'Junio C Hamano1-0/+6
2010-03-24Teach rebase the --no-ff option.Marc Branchaud1-2/+2
2010-03-12rebase: support automatic notes copyingThomas Rast1-0/+1
2010-03-12rebase: invoke post-rewrite hookThomas Rast1-0/+5
2010-01-30rebase: don't invoke the pager for each commit summaryMarkus Heidelberg1-1/+1
2010-01-25rebase: replace antiquated sed invocationStephen Boyd1-4/+2
2010-01-18Merge branch 'jc/rerere'Junio C Hamano1-1/+5
2010-01-13Merge branch 'jc/checkout-merge-base'Junio C Hamano1-1/+23
2010-01-07rebase: fix --onto A...B parsing and add testsNanako Shiraishi1-14/+19
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano1-1/+5
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano1-1/+1
2009-11-23Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano1-1/+1
2009-11-21"rebase --onto A...B" replays history on the merge base between A and BJunio C Hamano1-1/+18
2009-10-24Use 'fast-forward' all over the placeFelipe Contreras1-1/+1
2009-09-11rebase: use plumbing to show dirty stateJeff King1-1/+1
2009-08-21Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano1-0/+3
2009-08-06rebase: consistent error messages for staged and unstaged changes.Matthieu Moy1-2/+4
2009-08-05git apply: option to ignore whitespace differencesGiuseppe Bilotta1-0/+3
2009-07-01Merge branch 'sb/quiet-porcelains'Junio C Hamano1-10/+38
2009-06-18am, rebase: teach quiet optionStephen Boyd1-10/+38
2009-06-14pull, rebase: simplify to use die()Stephen Boyd1-6/+3
2009-03-27rebase: fix typo (force_rebas -> force-rebas)Michele Ballabio1-1/+1
2009-03-18rebase: add options passed to git-amMichele Ballabio1-0/+4
2009-03-11Merge branch 'tv/rebase-stat'Junio C Hamano1-7/+18
2009-03-05Merge branch 'sr/force-rebase'Junio C Hamano1-5/+19
2009-03-02git-rebase: Add --stat and --no-stat for producing diffstat on rebaseTor Arne Vestbø1-7/+18
2009-02-18disallow providing multiple upstream branches to rebase, pull --rebaseJay Soffian1-0/+1
2009-02-13Teach rebase to rebase even if upstream is up to dateSverre Rabbelier1-5/+19
2009-01-11rebase: learn to rebase root commitThomas Rast1-16/+40
2008-12-10rebase: improve error messages about dirty stateJeff King1-3/+6
2008-12-03rebase: use git rev-parse -qMiklos Vajna1-2/+2
2008-10-19Merge branch 'ae/preservemerge'Junio C Hamano1-3/+19
2008-10-06rebase --no-verifyNanako Shiraishi1-1/+6
2008-10-06Teach rebase -i to honor pre-rebase hookNanako Shiraishi1-7/+11
2008-09-30rebase: Support preserving merges in non-interactive modeAndreas Ericsson1-3/+19
2008-08-16Improve error output of git-rebaseStephan Beyer1-5/+16
2008-07-21Rename .git/rebase to .git/rebase-applyJohannes Schindelin1-23/+25
2008-07-16Merge branch 'rs/rebase-checkout-not-so-quiet'Junio C Hamano1-2/+1
2008-07-15Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin1-22/+22
2008-07-14git-rebase: report checkout failureJunio C Hamano1-3/+1
2008-07-07Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano1-1/+1
2008-06-22git-rebase.sh: Add check if rebase is in progressStephan Beyer1-4/+10
2008-05-15Ignore dirty submodule states during rebase and stashJohannes Schindelin1-4/+4
2008-05-14Merge branch 'bd/tests'Junio C Hamano1-1/+1
2008-05-13fix bsd shell negationJeff King1-1/+1
2008-05-05git-rebase.sh: Fix --merge --abort failures when path contains whitespaceBryan Donlan1-1/+1
2008-03-16rebase [--onto O] A B: omit needless checkoutJunio C Hamano1-20/+32
2008-03-16Merge branch 'maint'Junio C Hamano1-1/+1
2008-03-16rebase -m: do not trigger pre-commit verificationJunio C Hamano1-1/+1
2008-03-11git rebase --abort: always restore the right commitMike Hommey1-3/+2
2008-03-10update 'git rebase' documentationSZEDER Gábor1-2/+1
2008-03-05am: --rebasingJunio C Hamano1-1/+1
2008-03-01git rebase --abort: always restore the right commitMike Hommey1-3/+2
2007-11-28Merge branch 'maint'Junio C Hamano1-2/+2
2007-11-28scripts: do not get confused with HEAD in work treeJunio C Hamano1-2/+2
2007-11-24Merge branch 'mh/rebase-skip-hard'Junio C Hamano1-0/+1
2007-11-17Merge branch 'ph/parseopt-sh'Junio C Hamano1-0/+1
2007-11-12rebase: fix "rebase --continue" breakageJohannes Schindelin1-1/+5
2007-11-11Do git reset --hard HEAD when using git rebase --skipMike Hommey1-0/+1
2007-11-09rebase: operate on a detached HEADJohannes Schindelin1-5/+51
2007-11-06scripts: Add placeholders for OPTIONS_SPECJunio C Hamano1-0/+1
2007-11-02Fixing path quoting in git-rebaseJonathan del Strother1-13/+13
2007-10-18Fixing path quoting in git-rebaseJonathan del Strother1-13/+13
2007-09-23Merge branch 'maint'Junio C Hamano1-3/+2
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup1-3/+2
2007-09-07git-rebase: fix -C optionJ. Bruce Fields1-1/+0
2007-09-07git-rebase: support --whitespace=<option>J. Bruce Fields1-1/+4
2007-09-01Avoid one-or-more (\+) non BRE in sed scripts.Junio C Hamano1-4/+1
2007-09-01rebase -m: Fix incorrect short-logs of already applied commits.Johannes Sixt1-5/+8
2007-07-06Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin1-9/+3
2007-07-04Allow rebase to run if upstream is completely mergedJohannes Sixt1-3/+5
2007-07-02Rewrite "git-frotz" to "git frotz"Junio C Hamano1-19/+19
2007-06-24Teach rebase an interactive modeJohannes Schindelin1-1/+11
2007-06-02git-rebase: suggest to use git-add instead of git-update-indexJonas Fonseca1-2/+2
2007-05-10Add colour support in rebase and merge tree diff stats output.James Bowes1-1/+2
2007-04-13Use rev-list --reverse in git-rebase.shAlex Riesen1-2/+1
2007-03-24Use diff* with --exit-code in git-am, git-rebase and git-merge-oursAlex Riesen1-6/+4
2007-03-22git-rebase: make 'rebase HEAD branch' work as expected.Junio C Hamano1-4/+4
2007-02-08add -C[NUM] to git-amMichael S. Tsirkin1-1/+6
2007-01-31Improved error message from git-rebaseDavid Kågedal1-1/+2
2007-01-20git-rebase: allow rebasing a detached HEAD.Junio C Hamano1-2/+6
2007-01-12Allow whole-tree operations to be started from a subdirectoryJunio C Hamano1-0/+3
2007-01-10Disallow working directory commands in a bare repository.Shawn O. Pearce1-0/+1
2006-12-28Use branch names in 'git-rebase -m' conflict hunks.Shawn O. Pearce1-1/+10
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce1-6/+4
2006-12-22merge and reset: adjust for "reset --hard" messagesJunio C Hamano1-0/+1
2006-12-09rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amEric Wong1-0/+8
2006-11-21remove merge-recursive-oldJunio C Hamano1-9/+0
2006-10-04git-rebase: Add a -v option to show a diffstat of the changes upstream at the...Robert Shearman1-1/+11
2006-10-04git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.Robert Shearman1-1/+1
2006-09-24Deprecate merge-recursive.pyJunio C Hamano1-15/+4
2006-08-12Merge branch 'master' into js/c-merge-recursiveJunio C Hamano1-9/+6
2006-07-31rebase: Make the fast-fowarding message more user-friendly by using branch na...Robert Shearman1-1/+1
2006-07-31rebase: Fix the detection of fast-forwarding of the current branch to upstream.Robert Shearman1-8/+5
2006-07-30Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano1-3/+6
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-16 14:40:01 +0000