summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rr/rebase-autostash'Junio C Hamano2013-06-232-0/+26
|\
| * rebase: finish_rebase() in noop rebaseRamkumar Ramachandra2013-06-132-0/+12
| * rebase: finish_rebase() in fast-forward rebaseRamkumar Ramachandra2013-06-132-0/+12
| * rebase: guard against missing files in read_basic_state()Ramkumar Ramachandra2013-06-131-0/+2
* | Merge branch 'rr/prompt-rebase-breakage-fix'Junio C Hamano2013-06-231-6/+6
|\ \
| * | prompt: squelch error output from catRamkumar Ramachandra2013-06-141-6/+6
* | | Merge branch 'jg/status-config'Junio C Hamano2013-06-233-0/+76
|\ \ \
| * | | status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-153-0/+35
| * | | status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-113-0/+41
* | | | Sync with maintJunio C Hamano2013-06-211-1/+1
|\ \ \ \
| * | | | completion: complete diff --word-diffRamkumar Ramachandra2013-06-211-1/+1
* | | | | transport-helper: be quiet on read errors from helpersJeff King2013-06-212-4/+2
* | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-201-1/+18
* | | | | Merge branch 'cm/remote-mediawiki'Junio C Hamano2013-06-201-0/+15
|\ \ \ \ \
| * | | | | git-remote-mediawiki: display message when launched directlyCélestin Matte2013-06-111-0/+15
| | |/ / / | |/| | |
* | | | | Merge branch 'rs/match-trees-refactor'Junio C Hamano2013-06-201-25/+19
|\ \ \ \ \
| * | | | | match-trees: factor out fill_tree_desc_strictRené Scharfe2013-06-131-25/+19
| | |/ / / | |/| | |
* | | | | Merge branch 'rs/logical-vs-binary-or'Junio C Hamano2013-06-203-6/+6
|\ \ \ \ \
| * | | | | use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe2013-06-133-6/+6
| |/ / / /
* | | | | Merge branch 'mm/color-auto-default'Junio C Hamano2013-06-203-6/+12
|\ \ \ \ \
| * | | | | make color.ui default to 'auto'Matthieu Moy2013-06-103-7/+8
| * | | | | config: refactor management of color.ui's default valueMatthieu Moy2013-05-151-0/+5
* | | | | | Merge branch 'rs/discard-index-discard-array'Junio C Hamano2013-06-205-2/+32
|\ \ \ \ \ \
| * | | | | | read-cache: free cache in discard_indexRené Scharfe2013-06-091-2/+3
| * | | | | | read-cache: add simple performance testRené Scharfe2013-06-094-0/+29
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'nd/traces'Junio C Hamano2013-06-205-9/+25
|\ \ \ \ \ \
| * | | | | | git.txt: document GIT_TRACE_PACKETNguyễn Thái Ngọc Duy2013-06-091-0/+6
| * | | | | | core: use env variable instead of config var to turn on logging pack accessNguyễn Thái Ngọc Duy2013-06-095-9/+19
| |/ / / / /
* | | | | | Merge branch 'fc/show-non-empty-errors-in-test'Junio C Hamano2013-06-209-53/+65
|\ \ \ \ \ \
| * | | | | | test: test_must_be_empty helperJunio C Hamano2013-06-099-53/+65
* | | | | | | Merge branch 'fc/makefile'Junio C Hamano2013-06-201-4/+6
|\ \ \ \ \ \ \
| * | | | | | | Makefile: use $^ to avoid listing prerequisites on the command lineFelipe Contreras2013-06-091-3/+3
| * | | | | | | build: do not install git-remote-testgitFelipe Contreras2013-06-071-0/+1
| * | | | | | | build: generate and clean test scriptsFelipe Contreras2013-06-071-1/+2
| * | | | | | | Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefileJunio C Hamano2013-06-076-56/+115
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'js/test-ln-s-add'Junio C Hamano2013-06-2030-333/+351
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t4011: remove SYMLINKS prerequisiteJohannes Sixt2013-06-071-10/+25
| * | | | | | | | | t6035: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt2013-06-071-26/+47
| * | | | | | | | | t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt2013-06-073-36/+33
| * | | | | | | | | t3100: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt2013-06-071-27/+15
| * | | | | | | | | t3030: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt2013-06-071-36/+26
| * | | | | | | | | t0000: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt2013-06-071-29/+10
| * | | | | | | | | tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)Johannes Sixt2013-06-0719-110/+106
| * | | | | | | | | tests: introduce test_ln_s_addJohannes Sixt2013-06-072-0/+31
| * | | | | | | | | t3010: modernize styleJohannes Sixt2013-06-071-62/+61
| * | | | | | | | | test-chmtime: Fix exit code on WindowsJohannes Sixt2013-06-021-4/+4
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/make-wildmatch-default'Junio C Hamano2013-06-201-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: promote wildmatch to be the default fnmatch implementationNguyễn Thái Ngọc Duy2013-06-021-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-guiJunio C Hamano2013-06-168-22/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-gui 0.18gitgui-0.18.0Pat Thoyts2013-06-151-1/+1