2011-12-09 | Martin von Zweigbergk | am: don't persist keepcr flag Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-09-12 | Martin von Zweigbergk | remote: only update remote-tracking branch if updating... Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-09-12 | Martin von Zweigbergk | remote rename: warn when refspec was not updated Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-09-12 | Martin von Zweigbergk | remote: "rename o foo" should not rename ref "origin... Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-09-12 | Martin von Zweigbergk | remote: write correct fetch spec when renaming remote... Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-07-14 | Martin von Zweigbergk | rebase: clarify "restore the original branch" Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-07-06 | Martin von Zweigbergk | Documentation: use [verse] for SYNOPSIS sections Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-03-24 | Martin von Zweigbergk | diffcore-rename: don't consider unmerged path as source Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-03-05 | Martin von Zweigbergk | rebase: define options in OPTIONS_SPEC Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-25 | Martin von Zweigbergk | Makefile: do not install sourced rebase scripts Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-16 | Martin von Zweigbergk | mergetool: don't skip modify/remove conflicts Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-16 | Martin von Zweigbergk | rerere "remaining" Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: use @{upstream} if no upstream specified Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase -i: remove unnecessary state rebase-root Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase -i: don't read unused variable preserve_merges Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | git-rebase--am: remove unnecessary --3way option Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase -m: don't print exit code 2 when merge fails Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase -m: remember allow_rerere_autoupdate option Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: remember strategy and strategy options Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: remember verbose option Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: extract code for writing basic state Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: factor out sub command handling Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: make -v a tiny bit more verbose Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase -i: align variable names Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: show consistent conflict resolution hint Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: extract am code to new source file Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: extract merge code to new source file Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: remove $branch as synonym for $orig_head Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase -i: support --stat Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: factor out call to pre-rebase hook Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: factor out clean work tree check Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: factor out reference parsing Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: reorder validation steps Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase -i: remove now unnecessary directory checks Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: factor out command line option processing Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: align variable content Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: align variable names Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: stricter check of standalone sub command Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: act on command line outside parsing loop Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: improve detection of rebase in progress Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: remove unused rebase state 'prev_head' Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: read state outside loop Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: refactor reading of state Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2011-02-10 | Martin von Zweigbergk | rebase: clearer names for directory variables Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2010-12-21 | Martin von Zweigbergk | completion: add missing configuration variables Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2010-11-29 | Martin von Zweigbergk | Use reflog in 'pull --rebase . foo' Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2010-11-29 | Martin von Zweigbergk | rebase: only show stat if configured to true Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2010-11-24 | Martin von Zweigbergk | rebase --abort: do not update branch ref Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2010-11-23 | Martin von Zweigbergk | rebase: support --verify Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2010-11-17 | Martin von Zweigbergk | Documentation/git-pull: clarify configuration Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |
2010-11-10 | Martin von Zweigbergk | rebase -X: do not clobber strategy Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
commit | commitdiff | tree |