Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rr/rebase-autostash' | Junio C Hamano | 2013-06-23 | 2 | -0/+26 |
|\ | |||||
| * | rebase: finish_rebase() in noop rebase | Ramkumar Ramachandra | 2013-06-13 | 2 | -0/+12 |
| * | rebase: finish_rebase() in fast-forward rebase | Ramkumar Ramachandra | 2013-06-13 | 2 | -0/+12 |
| * | rebase: guard against missing files in read_basic_state() | Ramkumar Ramachandra | 2013-06-13 | 1 | -0/+2 |
* | | Merge branch 'rr/prompt-rebase-breakage-fix' | Junio C Hamano | 2013-06-23 | 1 | -6/+6 |
|\ \ | |||||
| * | | prompt: squelch error output from cat | Ramkumar Ramachandra | 2013-06-14 | 1 | -6/+6 |
* | | | Merge branch 'jg/status-config' | Junio C Hamano | 2013-06-23 | 3 | -0/+76 |
|\ \ \ | |||||
| * | | | status: introduce status.branch to enable --branch by default | Jorge Juan Garcia Garcia | 2013-06-15 | 3 | -0/+35 |
| * | | | status: introduce status.short to enable --short by default | Jorge Juan Garcia Garcia | 2013-06-11 | 3 | -0/+41 |
* | | | | Sync with maint | Junio C Hamano | 2013-06-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | completion: complete diff --word-diff | Ramkumar Ramachandra | 2013-06-21 | 1 | -1/+1 |
* | | | | | transport-helper: be quiet on read errors from helpers | Jeff King | 2013-06-21 | 2 | -4/+2 |
* | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-20 | 1 | -1/+18 |
* | | | | | Merge branch 'cm/remote-mediawiki' | Junio C Hamano | 2013-06-20 | 1 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | git-remote-mediawiki: display message when launched directly | Célestin Matte | 2013-06-11 | 1 | -0/+15 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'rs/match-trees-refactor' | Junio C Hamano | 2013-06-20 | 1 | -25/+19 |
|\ \ \ \ \ | |||||
| * | | | | | match-trees: factor out fill_tree_desc_strict | René Scharfe | 2013-06-13 | 1 | -25/+19 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'rs/logical-vs-binary-or' | Junio C Hamano | 2013-06-20 | 3 | -6/+6 |
|\ \ \ \ \ | |||||
| * | | | | | use logical OR (||) instead of binary OR (|) in logical context | René Scharfe | 2013-06-13 | 3 | -6/+6 |
| |/ / / / | |||||
* | | | | | Merge branch 'mm/color-auto-default' | Junio C Hamano | 2013-06-20 | 3 | -6/+12 |
|\ \ \ \ \ | |||||
| * | | | | | make color.ui default to 'auto' | Matthieu Moy | 2013-06-10 | 3 | -7/+8 |
| * | | | | | config: refactor management of color.ui's default value | Matthieu Moy | 2013-05-15 | 1 | -0/+5 |
* | | | | | | Merge branch 'rs/discard-index-discard-array' | Junio C Hamano | 2013-06-20 | 5 | -2/+32 |
|\ \ \ \ \ \ | |||||
| * | | | | | | read-cache: free cache in discard_index | René Scharfe | 2013-06-09 | 1 | -2/+3 |
| * | | | | | | read-cache: add simple performance test | René Scharfe | 2013-06-09 | 4 | -0/+29 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'nd/traces' | Junio C Hamano | 2013-06-20 | 5 | -9/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git.txt: document GIT_TRACE_PACKET | Nguyễn Thái Ngọc Duy | 2013-06-09 | 1 | -0/+6 |
| * | | | | | | core: use env variable instead of config var to turn on logging pack access | Nguyễn Thái Ngọc Duy | 2013-06-09 | 5 | -9/+19 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'fc/show-non-empty-errors-in-test' | Junio C Hamano | 2013-06-20 | 9 | -53/+65 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test: test_must_be_empty helper | Junio C Hamano | 2013-06-09 | 9 | -53/+65 |
* | | | | | | | Merge branch 'fc/makefile' | Junio C Hamano | 2013-06-20 | 1 | -4/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Makefile: use $^ to avoid listing prerequisites on the command line | Felipe Contreras | 2013-06-09 | 1 | -3/+3 |
| * | | | | | | | build: do not install git-remote-testgit | Felipe Contreras | 2013-06-07 | 1 | -0/+1 |
| * | | | | | | | build: generate and clean test scripts | Felipe Contreras | 2013-06-07 | 1 | -1/+2 |
| * | | | | | | | Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile | Junio C Hamano | 2013-06-07 | 6 | -56/+115 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'js/test-ln-s-add' | Junio C Hamano | 2013-06-20 | 30 | -333/+351 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t4011: remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 1 | -10/+25 |
| * | | | | | | | | | t6035: use test_ln_s_add to remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 1 | -26/+47 |
| * | | | | | | | | | t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 3 | -36/+33 |
| * | | | | | | | | | t3100: use test_ln_s_add to remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 1 | -27/+15 |
| * | | | | | | | | | t3030: use test_ln_s_add to remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 1 | -36/+26 |
| * | | | | | | | | | t0000: use test_ln_s_add to remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 1 | -29/+10 |
| * | | | | | | | | | tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) | Johannes Sixt | 2013-06-07 | 19 | -110/+106 |
| * | | | | | | | | | tests: introduce test_ln_s_add | Johannes Sixt | 2013-06-07 | 2 | -0/+31 |
| * | | | | | | | | | t3010: modernize style | Johannes Sixt | 2013-06-07 | 1 | -62/+61 |
| * | | | | | | | | | test-chmtime: Fix exit code on Windows | Johannes Sixt | 2013-06-02 | 1 | -4/+4 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'nd/make-wildmatch-default' | Junio C Hamano | 2013-06-20 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Makefile: promote wildmatch to be the default fnmatch implementation | Nguyễn Thái Ngọc Duy | 2013-06-02 | 1 | -2/+2 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui | Junio C Hamano | 2013-06-16 | 8 | -22/+40 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-gui 0.18gitgui-0.18.0 | Pat Thoyts | 2013-06-15 | 1 | -1/+1 |