?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
rebase -i: don't read unused variable preserve_merges
2011-02-10 Martin von Zweigbergkrebase -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 Zweigbergkgit-rebase--am: remove unnecessary --3way option
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase -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 Zweigbergkrebase -m: remember allow_rerere_autoupdate option
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: remember strategy and strategy options
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: remember verbose option
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: extract code for writing basic state
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: factor out sub command handling
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: 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 Zweigbergkrebase -i: align variable names
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: show consistent conflict resolution hint
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: 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 Zweigbergkrebase: 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 Zweigbergkrebase: 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 Zweigbergkrebase -i: support --stat
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: 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 Zweigbergkrebase: factor out clean work tree check
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: factor out reference parsing
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: reorder validation steps
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase -i: remove now unnecessary directory checks
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: factor out command line option processing
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: align variable content
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: align variable names
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: stricter check of standalone sub command
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: 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 Zweigbergkrebase: improve detection of rebase in progress
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: remove unused rebase state 'prev_head'
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: read state outside loop
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: refactor reading of state
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2011-02-10 Martin von Zweigbergkrebase: clearer names for directory variables
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2010-12-21 Martin von Zweigbergkcompletion: add missing configuration variables
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2010-11-29 Martin von ZweigbergkUse reflog in 'pull --rebase . foo'
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2010-11-29 Martin von Zweigbergkrebase: 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 Zweigbergkrebase --abort: do not update branch ref
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2010-11-23 Martin von Zweigbergkrebase: support --verify
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2010-11-17 Martin von ZweigbergkDocumentation/git-pull: clarify configuration
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
2010-11-10 Martin von Zweigbergkrebase -X: do not clobber strategy
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail...
commit | commitdiff | tree
knittl's private git fork