summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-06-24Update draft release notes to 1.8.4Libravatar Junio C Hamano1-4/+14
2013-06-24Merge branch 'rr/am-quit-empty-then-abort-fix'Libravatar Junio C Hamano2-17/+40
2013-06-24Merge branch 'rt/cherry-pick-continue-advice-in-status'Libravatar Junio C Hamano2-4/+8
2013-06-24Merge branch 'nk/config-local-doc'Libravatar Junio C Hamano1-0/+9
2013-06-24Merge branch 'jk/mergetool-lib-refactor'Libravatar Junio C Hamano1-47/+35
2013-06-24Merge branch 'jk/doc-build-move-infordir-def'Libravatar Junio C Hamano1-22/+22
2013-06-24Merge branch 'fg/submodule-fixup'Libravatar Junio C Hamano1-2/+2
2013-06-24Merge branch 'dk/version-gen-gitdir'Libravatar Junio C Hamano1-1/+1
2013-06-24Merge branch 'dk/maint-t5150-dirname'Libravatar Junio C Hamano1-1/+1
2013-06-24Merge branch 'rs/unpack-trees-tree-walk-conflict-field'Libravatar Junio C Hamano2-16/+4
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Libravatar Junio C Hamano4-2/+36
2013-06-24Merge branch 'mm/rm-coalesce-errors'Libravatar Junio C Hamano5-19/+184
2013-06-24Merge branch 'jh/libify-note-handling'Libravatar Junio C Hamano8-189/+203
2013-06-24Merge branch 'fc/sequencer-plug-leak'Libravatar Junio C Hamano1-7/+11
2013-06-24Revert "Merge branch 'jg/status-config'"Libravatar Junio C Hamano3-76/+0
2013-06-23Update draft release notes to 1.8.4Libravatar Junio C Hamano1-0/+4
2013-06-23Merge branch 'mz/rebase-tests'Libravatar Junio C Hamano8-203/+673
2013-06-23Merge branch 'jk/unpack-entry-fallback-to-another'Libravatar Junio C Hamano2-2/+38
2013-06-23Merge branch 'jk/apache-test-for-2.4'Libravatar Junio C Hamano1-1/+19
2013-06-23Merge branch 'cm/remote-mediawiki-perlcritique'Libravatar Junio C Hamano3-247/+320
2013-06-23Merge branch 'bp/remote-mw-tests'Libravatar Junio C Hamano2-10/+13
2013-06-23Merge branch 'rr/rebase-autostash'Libravatar Junio C Hamano2-0/+26
2013-06-23Merge branch 'rr/prompt-rebase-breakage-fix'Libravatar Junio C Hamano1-6/+6
2013-06-23Merge branch 'jg/status-config'Libravatar Junio C Hamano3-0/+76
2013-06-21lib-httpd/apache.conf: check version only after mod_version loadsLibravatar Jeff King1-3/+4
2013-06-21Sync with maintLibravatar Junio C Hamano1-1/+1
2013-06-21transport-helper: be quiet on read errors from helpersLibravatar Jeff King2-4/+2
2013-06-21completion: complete diff --word-diffLibravatar Ramkumar Ramachandra1-1/+1
2013-06-20Update draft release notes to 1.8.4Libravatar Junio C Hamano1-1/+18
2013-06-20Merge branch 'cm/remote-mediawiki'Libravatar Junio C Hamano1-0/+15
2013-06-20Merge branch 'rs/match-trees-refactor'Libravatar Junio C Hamano1-25/+19
2013-06-20Merge branch 'rs/logical-vs-binary-or'Libravatar Junio C Hamano3-6/+6
2013-06-20Merge branch 'mm/color-auto-default'Libravatar Junio C Hamano3-6/+12
2013-06-20Merge branch 'rs/discard-index-discard-array'Libravatar Junio C Hamano5-2/+32
2013-06-20Merge branch 'nd/traces'Libravatar Junio C Hamano5-9/+25
2013-06-20Merge branch 'fc/show-non-empty-errors-in-test'Libravatar Junio C Hamano9-53/+65
2013-06-20Merge branch 'fc/makefile'Libravatar Junio C Hamano1-4/+6
2013-06-20Merge branch 'js/test-ln-s-add'Libravatar Junio C Hamano30-333/+351
2013-06-20Merge branch 'nd/make-wildmatch-default'Libravatar Junio C Hamano1-2/+2
2013-06-18rebase topology tests: fix commit names on case-insensitive file systemsLibravatar Johannes Sixt2-18/+18
2013-06-17config: Add description of --local optionLibravatar Namhyung Kim1-0/+9
2013-06-17git-submodule.sh: remove duplicate call to set_rev_nameLibravatar Fredrik Gustafsson1-2/+2
2013-06-17wt-status: give better advice when cherry-pick is in progressLibravatar Ralf Thielow2-4/+8
2013-06-17mergetool--lib: refactor {diff,merge}_cmd logicLibravatar John Keeping1-47/+35
2013-06-17Documentation/Makefile: move infodir to be with other '*dir'sLibravatar John Keeping1-1/+1
2013-06-17Documentation/Makefile: fix spaces around assignmentsLibravatar John Keeping1-21/+21
2013-06-17GIT-VERSION-GEN: support non-standard $GIT_DIR pathLibravatar Dennis Kaarsemaker1-1/+1
2013-06-17tests: allow sha1's as part of the pathLibravatar Dennis Kaarsemaker1-1/+1
2013-06-17unpack-trees: don't shift conflicts left and rightLibravatar René Scharfe2-16/+4
2013-06-17t/am: use test_path_is_missing() where appropriateLibravatar Ramkumar Ramachandra1-17/+17