summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano2011-04-288-40/+152
|\
| * diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-227-10/+112
| * diffcore-rename: record filepair for rename srcJunio C Hamano2011-03-221-11/+12
| * diffcore-rename: refactor "too many candidates" logicJunio C Hamano2011-03-221-18/+29
| * builtin/diff.c: remove duplicated call to diff_result_code()Junio C Hamano2011-03-221-3/+1
* | Merge branch 'mz/rebase'Junio C Hamano2011-04-2814-868/+844
|\ \
| * | 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 'en/merge-recursive'Junio C Hamano2011-04-282-6/+81
|\ \ \
| * | | merge-recursive: tweak magic band-aidJunio C Hamano2011-03-171-1/+8
| * | | merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-03-022-7/+12
| * | | t6022: New test checking for unnecessary updates of files in D/F conflictsElijah Newren2011-03-021-0/+33
| * | | t6022: New test checking for unnecessary updates of renamed+modified filesElijah Newren2011-03-021-0/+30
* | | | Merge branch 'jh/dirstat'Junio C Hamano2011-04-288-12/+81
|\ \ \ \
| * | | | --dirstat: In case of renames, use target filename instead of source filenameJohan Herland2011-04-121-1/+1
| * | | | Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland2011-04-114-5/+21
| * | | | --dirstat-by-file: Make it faster and more correctJohan Herland2011-04-113-5/+25
| * | | | --dirstat: Describe non-obvious differences relative to --stat or regular diffJohan Herland2011-04-116-7/+40
View Lorry Controller Status