tokkee.org
Code
projects
/
git.git
/ search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
rebase: clarify "restore the original branch"
2011-07-14
Martin von Zweigbergk
rebase: clarify "restore the original branch"
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigbergk
diffcore-rename: don't consider unmerged path as source
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zweigbergk
rebase: define options in OPTIONS_SPEC
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zweigbergk
Makefile: do not install sourced rebase scripts
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigbergk
mergetool: don't skip modify/remove conflicts
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigbergk
rerere "remaining"
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: use @{upstream} if no upstream specified
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: remove unnecessary state rebase-root
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: don't read unused variable preserve_merges
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
git-rebase--am: remove unnecessary --3way option
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -m: don't print exit code 2 when merge fails
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -m: remember allow_rerere_autoupdate option
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: remember strategy and strategy options
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: remember verbose option
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: extract code for writing basic state
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out sub command handling
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: make -v a tiny bit more verbose
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: align variable names
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: show consistent conflict resolution hint
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: extract am code to new source file
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: extract merge code to new source file
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: remove $branch as synonym for $orig_head
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: support --stat
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out call to pre-rebase hook
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out clean work tree check
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out reference parsing
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: reorder validation steps
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: remove now unnecessary directory checks
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out command line option processing
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: align variable content
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: align variable names
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: stricter check of standalone sub command
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: act on command line outside parsing loop
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: improve detection of rebase in progress
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: remove unused rebase state 'prev_head'
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: read state outside loop
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: refactor reading of state
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: clearer names for directory variables
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zweigbergk
completion: add missing configuration variables
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
Use reflog in 'pull --rebase . foo'
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
rebase: only show stat if configured to true
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigbergk
rebase --abort: do not update branch ref
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zweigbergk
rebase: support --verify
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zweigbergk
Documentation/git-pull: clarify configuration
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigbergk
rebase -X: do not clobber strategy
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree