Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-08-03 | 1 | -4/+188 |
|\ | |||||
| * | git rebase -i: add static check for commands and SHA-1 | Galan Rémi | 2015-06-30 | 1 | -0/+72 |
| * | git rebase -i: warn about removed commits | Galan Rémi | 2015-06-30 | 1 | -3/+114 |
| * | git-rebase -i: add command "drop" to remove a commit | Galan Rémi | 2015-06-30 | 1 | -1/+2 |
* | | Merge branch 'mr/rebase-i-customize-insn-sheet' | Junio C Hamano | 2015-08-03 | 1 | -3/+17 |
|\ \ | |||||
| * | | git-rebase--interactive.sh: add config option for custom instruction format | Michael Rappazzo | 2015-06-15 | 1 | -3/+17 |
* | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' | Junio C Hamano | 2015-07-13 | 1 | -1/+5 |
|\ \ \ | |/ / |/| | | |||||
| * | | rebase -i: do not leave a CHERRY_PICK_HEAD file behind | Johannes Schindelin | 2015-06-29 | 1 | -1/+5 |
* | | | Merge branch 'mm/rebase-i-post-rewrite-exec' | Junio C Hamano | 2015-06-01 | 1 | -5/+5 |
|\ \ \ | |_|/ |/| | | |||||
| * | | rebase -i: fix post-rewrite hook with failed exec command | Matthieu Moy | 2015-05-22 | 1 | -5/+5 |
| * | | Merge branch 'rr/rebase-autostash-fix' into maint | Junio C Hamano | 2014-06-25 | 1 | -2/+2 |
| |\ \ | |||||
* | \ \ | Merge branch 'ph/rebase-i-redo' | Junio C Hamano | 2015-05-19 | 1 | -0/+16 |
|\ \ \ \ | |||||
| * | | | | rebase -i: redo tasks that die during cherry-pick | Phil Hord | 2015-04-29 | 1 | -0/+16 |
| * | | | | Merge branch 'es/rebase-i-count-todo' into maint | Junio C Hamano | 2015-03-23 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ks/rebase-i-abbrev' into maint | Junio C Hamano | 2015-03-05 | 1 | -9/+8 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'nd/multiple-work-trees' | Junio C Hamano | 2015-05-11 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | *.sh: avoid hardcoding $GIT_DIR/hooks/... | Nguyễn Thái Ngọc Duy | 2014-12-01 | 1 | -3/+3 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'es/rebase-i-count-todo' | Junio C Hamano | 2015-03-18 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | rebase-interactive: re-word "item count" comment | Eric Sunshine | 2015-03-06 | 1 | -1/+1 |
| * | | | | | | rebase-interactive: suppress whitespace preceding item count | Eric Sunshine | 2015-03-06 | 1 | -0/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'ks/rebase-i-abbrev' | Junio C Hamano | 2015-02-17 | 1 | -9/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | rebase -i: use full object name internally throughout the script | Kirill A. Shutemov | 2015-01-22 | 1 | -9/+8 |
| |/ / / | |||||
* / / / | Show number of TODO items for interactive rebase | Onno Kortmann | 2014-12-10 | 1 | -1/+3 |
|/ / / | |||||
* | | | rebase: omit patch-identical commits with --fork-point | John Keeping | 2014-07-16 | 1 | -1/+1 |
* | | | Merge branch 'ep/avoid-test-a-o' | Junio C Hamano | 2014-06-25 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'rr/rebase-autostash-fix' | Junio C Hamano | 2014-06-16 | 1 | -2/+2 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | rebase -i: handle "Nothing to do" case with autostash | Ramkumar Ramachandra | 2014-05-20 | 1 | -2/+2 |
* | | Merge branch 'km/avoid-non-function-return-in-rebase' | Junio C Hamano | 2014-04-21 | 1 | -0/+15 |
|\ \ | |||||
| * | | rebase: avoid non-function use of "return" on FreeBSD | Kyle J. McKay | 2014-04-17 | 1 | -0/+15 |
* | | | Merge branch 'us/printf-not-echo' | Junio C Hamano | 2014-03-25 | 1 | -1/+1 |
|\| | | |||||
| * | | rebase -i: do not "echo" random user-supplied strings | Uwe Storbeck | 2014-03-17 | 1 | -1/+1 |
* | | | rebase: add the --gpg-sign option | Nicolas Vigier | 2014-02-11 | 1 | -13/+26 |
|/ / | |||||
* | | remove #!interpreter line from shell libraries | Jonathan Nieder | 2013-11-26 | 1 | -6/+3 |
* | | rebase -i: respect core.abbrev | Kirill A. Shutemov | 2013-09-30 | 1 | -1/+1 |
* | | Merge branch 'es/rebase-i-no-abbrev' | Junio C Hamano | 2013-09-12 | 1 | -0/+30 |
|\ \ | |||||
| * | | rebase -i: fix short SHA-1 collision | Junio C Hamano | 2013-08-26 | 1 | -0/+30 |
* | | | Merge branch 'rt/rebase-p-no-merge-summary' | Junio C Hamano | 2013-09-12 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | rebase --preserve-merges: ignore "merge.log" config | Ralf Thielow | 2013-08-22 | 1 | -1/+2 |
| |/ / | |||||
* | | | Merge branch 'es/rebase-i-respect-core-commentchar' | Junio C Hamano | 2013-09-11 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | rebase -i: fix cases ignoring core.commentchar | Eric Sunshine | 2013-08-18 | 1 | -1/+1 |
* | | | Merge branch 'rr/rebase-reflog-message-reword' | Junio C Hamano | 2013-07-18 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | rebase -i: use a better reflog message | Ramkumar Ramachandra | 2013-06-24 | 1 | -1/+5 |
| |/ / | |||||
* | | | Merge branch 'af/rebase-i-merge-options' | Junio C Hamano | 2013-07-11 | 1 | -5/+16 |
|\ \ \ | |||||
| * | | | Do not ignore merge options in interactive rebase | Arnaud Fontaine | 2013-07-02 | 1 | -5/+16 |
| | |/ | |/| | |||||
* / | | rebase -i: handle fixup! fixup! in --autosquash | Andrew Pimlott | 2013-06-27 | 1 | -5/+20 |
|/ / | |||||
* | | rebase -i: return control to caller, for housekeeping | Ramkumar Ramachandra | 2013-05-13 | 1 | -4/+5 |
* | | rebase -i: don't error out if $state_dir already exists | Ramkumar Ramachandra | 2013-05-13 | 1 | -1/+1 |
|/ | |||||
* | bash-prompt.sh: show where rebase is at when stopped | Zoltan Klinger | 2013-04-25 | 1 | -0/+5 |
* | Merge branch 'jk/rebase-i-comment-char' | Junio C Hamano | 2013-02-18 | 1 | -40/+44 |
|\ |