summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-17unpack-trees: don't shift conflicts left and rightLibravatar René Scharfe2-16/+4
2013-06-16Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-guiLibravatar Junio C Hamano8-22/+40
2013-06-15status: introduce status.branch to enable --branch by defaultLibravatar Jorge Juan Garcia Garcia3-0/+35
2013-06-15Update draft release notes to 1.8.4Libravatar Junio C Hamano1-0/+17
2013-06-15git-gui 0.18Libravatar Pat Thoyts1-1/+1
2013-06-15git-gui: avoid an error message when removing the last remoteLibravatar Pat Thoyts1-2/+4
2013-06-14unpack_entry: do not die when we fail to apply a deltaLibravatar Jeff King2-1/+37
2013-06-14t5303: drop "count=1" from corruption ddLibravatar Jeff King1-1/+1
2013-06-14git-remote-mediawiki: remove hardcoded version number in the test suiteLibravatar Benoit Person2-10/+13
2013-06-14t/lib-httpd/apache.conf: configure an MPM module for apache 2.4Libravatar Jeff King1-0/+3
2013-06-14t/lib-httpd/apache.conf: load compat access module in apache 2.4Libravatar Jeff King1-0/+3
2013-06-14t/lib-httpd/apache.conf: load extra auth modules in apache 2.4Libravatar Jeff King1-0/+9
2013-06-14t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4Libravatar Jeff King1-0/+2
2013-06-14rebase: use peel_committish() where appropriateLibravatar Ramkumar Ramachandra3-4/+4
2013-06-14sh-setup: add new peel_committish() helperLibravatar Ramkumar Ramachandra1-0/+12
2013-06-14t/rebase: add failing tests for a peculiar revisionLibravatar Ramkumar Ramachandra2-0/+22
2013-06-14git-remote-mediawiki: make error message more preciseLibravatar Célestin Matte1-3/+7
2013-06-14git-remote-mediawiki: add a perlcritic rule in MakefileLibravatar Célestin Matte1-0/+2
2013-06-14git-remote-mediawiki: add a .perlcriticrc fileLibravatar Célestin Matte1-0/+28