summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rebase: define options in OPTIONS_SPECMartin von Zweigbergk2011-03-041-45/+56
* Makefile: do not install sourced rebase scriptsMartin von Zweigbergk2011-02-252-3/+3
* rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-106-46/+85
* rebase -i: remove unnecessary state rebase-rootMartin von Zweigbergk2011-02-101-19/+0
* rebase -i: don't read unused variable preserve_mergesMartin von Zweigbergk2011-02-101-1/+0
* git-rebase--am: remove unnecessary --3way optionMartin von Zweigbergk2011-02-101-2/+2
* rebase -m: don't print exit code 2 when merge failsMartin von Zweigbergk2011-02-101-1/+1
* rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk2011-02-102-0/+25
* rebase: remember strategy and strategy optionsMartin von Zweigbergk2011-02-103-2/+35
* rebase: remember verbose optionMartin von Zweigbergk2011-02-102-4/+4
* rebase: extract code for writing basic stateMartin von Zweigbergk2011-02-104-16/+16
* rebase: factor out sub command handlingMartin von Zweigbergk2011-02-102-33/+18
* rebase: make -v a tiny bit more verboseMartin von Zweigbergk2011-02-102-16/+16
* rebase -i: align variable namesMartin von Zweigbergk2011-02-101-61/+59
* rebase: show consistent conflict resolution hintMartin von Zweigbergk2011-02-101-3/+1
* rebase: extract am code to new source fileMartin von Zweigbergk2011-02-104-29/+38
* rebase: extract merge code to new source fileMartin von Zweigbergk2011-02-104-151/+167
* rebase: remove $branch as synonym for $orig_headMartin von Zweigbergk2011-02-101-10/+9
* rebase -i: support --statMartin von Zweigbergk2011-02-101-7/+7
* rebase: factor out call to pre-rebase hookMartin von Zweigbergk2011-02-102-19/+7
* rebase: factor out clean work tree checkMartin von Zweigbergk2011-02-102-4/+2
* rebase: factor out reference parsingMartin von Zweigbergk2011-02-102-48/+9
* rebase: reorder validation stepsMartin von Zweigbergk2011-02-102-7/+7
* rebase -i: remove now unnecessary directory checksMartin von Zweigbergk2011-02-101-6/+0
* rebase: factor out command line option processingMartin von Zweigbergk2011-02-102-182/+100
* rebase: align variable contentMartin von Zweigbergk2011-02-102-6/+14
* rebase: align variable namesMartin von Zweigbergk2011-02-102-256/+256
* rebase: stricter check of standalone sub commandMartin von Zweigbergk2011-02-104-2/+22
* rebase: act on command line outside parsing loopMartin von Zweigbergk2011-02-102-209/+217
* rebase: improve detection of rebase in progressMartin von Zweigbergk2011-02-101-39/+41
* rebase: remove unused rebase state 'prev_head'Martin von Zweigbergk2011-02-101-8/+0
* rebase: read state outside loopMartin von Zweigbergk2011-02-101-2/+2
* rebase: refactor reading of stateMartin von Zweigbergk2011-02-101-30/+23
* rebase: clearer names for directory variablesMartin von Zweigbergk2011-02-101-70/+71
* Merge branch 'tr/merge-unborn-clobber'Junio C Hamano2011-02-091-0/+16
|\
| * Exhibit merge bug that clobbers index&WTThomas Rast2010-08-251-0/+16
* | Merge branch 'jc/unpack-trees'Junio C Hamano2011-02-091-2/+62
|\ \
| * | unpack_trees(): skip trees that are the same in all inputJunio C Hamano2011-01-041-0/+56
| * | unpack-trees.c: cosmetic fixJunio C Hamano2010-12-221-4/+8
* | | Merge branch 'jc/fsck-fixes'Junio C Hamano2011-02-091-9/+22
|\ \ \
| * | | fsck: do not give up too early in fsck_dir()Junio C Hamano2011-01-271-6/+12
| * | | fsck: drop unused parameter from traverse_one_object()Junio C Hamano2011-01-271-3/+10
* | | | Merge branch 'tr/diff-words-test'Junio C Hamano2011-02-0941-255/+933
|\ \ \ \
| * | | | t4034 (diff --word-diff): add a minimum Perl drier test vectorJunio C Hamano2011-01-184-0/+58
| * | | | t4034 (diff --word-diff): style suggestionsJonathan Nieder2011-01-181-245/+205
| * | | | userdiff: simplify word-diff safeguardJonathan Nieder2011-01-181-24/+16
| * | | | t4034: bulk verify builtin word regex sanityThomas Rast2011-01-1837-0/+668
* | | | | Merge branch 'rr/fi-import-marks-if-exists'Junio C Hamano2011-02-093-3/+72
|\ \ \ \ \
| * | | | | fast-import: Introduce --import-marks-if-existsRamkumar Ramachandra2011-01-183-3/+72
| |/ / / /
* | | | | Merge branch 'jn/unpack-lstat-failure-report'Junio C Hamano2011-02-091-6/+12
|\ \ \ \ \