Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add config variable for specifying default --dirstat behavior | Johan Herland | 2011-04-29 | 4 | -1/+119 |
* | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file | Johan Herland | 2011-04-29 | 3 | -22/+214 |
* | Make --dirstat=0 output directories that contribute < 0.1% of changes | Johan Herland | 2011-04-29 | 2 | -4/+4 |
* | Add several testcases for --dirstat and friends | Johan Herland | 2011-04-29 | 1 | -0/+585 |
* | t/test-lib.sh: minor readability improvements | Mathias Lafeldt | 2011-04-29 | 1 | -7/+9 |
* | diffcore-rename.c: avoid set-but-not-used warning | Jim Meyering | 2011-04-29 | 1 | -2/+1 |
* | Merge branch 'jc/diff-irreversible-delete' | Junio C Hamano | 2011-04-28 | 4 | -6/+70 |
|\ | |||||
| * | git diff -D: omit the preimage of deletes | Junio C Hamano | 2011-04-02 | 4 | -6/+70 |
* | | Merge branch 'jc/rename-degrade-cc-to-c' | Junio C Hamano | 2011-04-28 | 8 | -40/+152 |
|\ \ | |||||
| * | | diffcore-rename: fall back to -C when -C -C busts the rename limit | Junio C Hamano | 2011-03-22 | 7 | -10/+112 |
| * | | diffcore-rename: record filepair for rename src | Junio C Hamano | 2011-03-22 | 1 | -11/+12 |
| * | | diffcore-rename: refactor "too many candidates" logic | Junio C Hamano | 2011-03-22 | 1 | -18/+29 |
| * | | builtin/diff.c: remove duplicated call to diff_result_code() | Junio C Hamano | 2011-03-22 | 1 | -3/+1 |
* | | | Merge branch 'mz/rebase' | Junio C Hamano | 2011-04-28 | 14 | -868/+844 |
|\ \ \ | |||||
| * | | | rebase: define options in OPTIONS_SPEC | Martin von Zweigbergk | 2011-03-04 | 1 | -45/+56 |
| * | | | Makefile: do not install sourced rebase scripts | Martin von Zweigbergk | 2011-02-25 | 2 | -3/+3 |
| * | | | rebase: use @{upstream} if no upstream specified | Martin von Zweigbergk | 2011-02-10 | 6 | -46/+85 |
| * | | | rebase -i: remove unnecessary state rebase-root | Martin von Zweigbergk | 2011-02-10 | 1 | -19/+0 |
| * | | | rebase -i: don't read unused variable preserve_merges | Martin von Zweigbergk | 2011-02-10 | 1 | -1/+0 |
| * | | | git-rebase--am: remove unnecessary --3way option | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+2 |
| * | | | rebase -m: don't print exit code 2 when merge fails | Martin von Zweigbergk | 2011-02-10 | 1 | -1/+1 |
| * | | | rebase -m: remember allow_rerere_autoupdate option | Martin von Zweigbergk | 2011-02-10 | 2 | -0/+25 |
| * | | | rebase: remember strategy and strategy options | Martin von Zweigbergk | 2011-02-10 | 3 | -2/+35 |
| * | | | rebase: remember verbose option | Martin von Zweigbergk | 2011-02-10 | 2 | -4/+4 |
| * | | | rebase: extract code for writing basic state | Martin von Zweigbergk | 2011-02-10 | 4 | -16/+16 |
| * | | | rebase: factor out sub command handling | Martin von Zweigbergk | 2011-02-10 | 2 | -33/+18 |
| * | | | rebase: make -v a tiny bit more verbose | Martin von Zweigbergk | 2011-02-10 | 2 | -16/+16 |
| * | | | rebase -i: align variable names | Martin von Zweigbergk | 2011-02-10 | 1 | -61/+59 |
| * | | | rebase: show consistent conflict resolution hint | Martin von Zweigbergk | 2011-02-10 | 1 | -3/+1 |
| * | | | rebase: extract am code to new source file | Martin von Zweigbergk | 2011-02-10 | 4 | -29/+38 |
| * | | | rebase: extract merge code to new source file | Martin von Zweigbergk | 2011-02-10 | 4 | -151/+167 |
| * | | | rebase: remove $branch as synonym for $orig_head | Martin von Zweigbergk | 2011-02-10 | 1 | -10/+9 |
| * | | | rebase -i: support --stat | Martin von Zweigbergk | 2011-02-10 | 1 | -7/+7 |
| * | | | rebase: factor out call to pre-rebase hook | Martin von Zweigbergk | 2011-02-10 | 2 | -19/+7 |
| * | | | rebase: factor out clean work tree check | Martin von Zweigbergk | 2011-02-10 | 2 | -4/+2 |
| * | | | rebase: factor out reference parsing | Martin von Zweigbergk | 2011-02-10 | 2 | -48/+9 |
| * | | | rebase: reorder validation steps | Martin von Zweigbergk | 2011-02-10 | 2 | -7/+7 |
| * | | | rebase -i: remove now unnecessary directory checks | Martin von Zweigbergk | 2011-02-10 | 1 | -6/+0 |
| * | | | rebase: factor out command line option processing | Martin von Zweigbergk | 2011-02-10 | 2 | -182/+100 |
| * | | | rebase: align variable content | Martin von Zweigbergk | 2011-02-10 | 2 | -6/+14 |
| * | | | rebase: align variable names | Martin von Zweigbergk | 2011-02-10 | 2 | -256/+256 |
| * | | | rebase: stricter check of standalone sub command | Martin von Zweigbergk | 2011-02-10 | 4 | -2/+22 |
| * | | | rebase: act on command line outside parsing loop | Martin von Zweigbergk | 2011-02-10 | 2 | -209/+217 |
| * | | | rebase: improve detection of rebase in progress | Martin von Zweigbergk | 2011-02-10 | 1 | -39/+41 |
| * | | | rebase: remove unused rebase state 'prev_head' | Martin von Zweigbergk | 2011-02-10 | 1 | -8/+0 |
| * | | | rebase: read state outside loop | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+2 |
| * | | | rebase: refactor reading of state | Martin von Zweigbergk | 2011-02-10 | 1 | -30/+23 |
| * | | | rebase: clearer names for directory variables | Martin von Zweigbergk | 2011-02-10 | 1 | -70/+71 |
* | | | | Merge branch 'en/merge-recursive' | Junio C Hamano | 2011-04-28 | 2 | -6/+81 |
|\ \ \ \ | |||||
| * | | | | merge-recursive: tweak magic band-aid | Junio C Hamano | 2011-03-17 | 1 | -1/+8 |