summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-20t7400: test of UTF-8 submodule names pass under Mac OSLibravatar Torsten Bögershausen1-8/+11
2013-06-19random typofixes (committed missing a 't', successful missing an 's')Libravatar Veres Lajos3-3/+3
2013-06-19http.c: don't rewrite the user:passwd string multiple timesLibravatar Brandon Casey1-3/+9
2013-06-18fix "builtin-*" references to be "builtin/*"Libravatar Phil Hord9-21/+20
2013-06-18Documentation: Move "git diff <blob> <blob>"Libravatar Kevin Bracey1-7/+7
2013-06-18Documentation/git-merge.txt: weaken warning about uncommited changesLibravatar Matthieu Moy1-2/+2
2013-06-18t/t9802: explicitly name the upstream branch to use as a baseLibravatar Brandon Casey1-2/+2
2013-06-18rebase topology tests: fix commit names on case-insensitive file systemsLibravatar Johannes Sixt2-18/+18
2013-06-18Documentation/git-push.txt: explain better cases where --force is dangerousLibravatar Matthieu Moy1-0/+9
2013-06-18builtin/checkout.c: don't leak memory in check_tracking_nameLibravatar Brandon Casey1-2/+5
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-17rebase: use 'git stash store' to simplify logicLibravatar Ramkumar Ramachandra1-5/+2
2013-06-17stash: introduce 'git stash store'Libravatar Ramkumar Ramachandra3-6/+67
2013-06-17unpack-trees: don't shift conflicts left and rightLibravatar René Scharfe2-16/+4
2013-06-17stash: simplify option parser for createLibravatar Ramkumar Ramachandra1-4/+1
2013-06-17stash doc: document short form -p in synopsisLibravatar Ramkumar Ramachandra1-1/+1
2013-06-17stash doc: add a warning about using createLibravatar Ramkumar Ramachandra1-1/+3
2013-06-17t/am: use test_path_is_missing() where appropriateLibravatar Ramkumar Ramachandra1-17/+17
2013-06-17am: handle stray $dotest directoryLibravatar Ramkumar Ramachandra2-0/+23
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
2013-06-14git-remote-mediawiki: clearly rewrite double dereferenceLibravatar Célestin Matte1-4/+4