summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-07-15Merge branch 'js/merge-rr-fix'Libravatar Junio C Hamano2-3/+3
2010-07-15Merge branch 'jc/diff-merge-base-multi'Libravatar Junio C Hamano1-8/+23
2010-07-15Merge branch 'ns/merge-recursive-uptodate'Libravatar Junio C Hamano1-1/+1
2010-07-15Merge branch 'jn/tests'Libravatar Junio C Hamano1-47/+42
2010-07-15Merge branch 'eb/doc-log-manpage'Libravatar Junio C Hamano1-6/+9
2010-07-15Merge branch 'jn/grep-open'Libravatar Junio C Hamano2-0/+16
2010-07-15Merge branch 'mg/revision-doc'Libravatar Junio C Hamano20-222/+257
2010-07-15Merge branch 'jk/maint-status-keep-index-timestamp'Libravatar Junio C Hamano1-5/+11
2010-07-15Merge branch 'jc/rebase-i-commit-msg-fix'Libravatar Junio C Hamano2-9/+28
2010-07-15Merge branch 'ab/submodule-add-f'Libravatar Junio C Hamano3-3/+29
2010-07-15Merge branch 'bc/maint-makefile-fixes'Libravatar Junio C Hamano1-5/+5
2010-07-15Merge branch 'maint'Libravatar Junio C Hamano3-2/+13
2010-07-15Documentation: add submodule.* to the big configuration variable listLibravatar Jonathan Nieder1-0/+9
2010-07-15gitmodules.5: url can be a relative pathLibravatar Jonathan Nieder1-0/+3
2010-07-15gitweb: fix esc_urlLibravatar Pavan Kumar Sunkara1-2/+1
2010-07-14git --paginate: paginate external commands againLibravatar Jonathan Nieder2-12/+38
2010-07-14MERGE_RR is in .git, not .git/rr-cacheLibravatar Jay Soffian2-3/+3
2010-07-14merge-tree: fix where two branches share no changesLibravatar Will Palmer2-4/+5
2010-07-14add basic tests for merge-treeLibravatar Will Palmer1-0/+257
2010-07-14Git 1.7.2-rc3Libravatar Junio C Hamano1-1/+4
2010-07-14Merge branch 'jc/read-tree-cache-tree-fix'Libravatar Junio C Hamano2-5/+16
2010-07-14Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()Libravatar Raja R Harinath1-1/+2
2010-07-13diff A...B: give one possible diff when there are more than one merge-baseLibravatar Junio C Hamano1-8/+23
2010-07-13Merge branch 'maint'Libravatar Junio C Hamano2-2/+5
2010-07-13git fetch documentation: describe short '-p' synonym to '--prune' optionLibravatar Oren Held1-0/+1
2010-07-13format-patch: document the format.to configuration settingLibravatar Miklos Vajna1-2/+4
2010-07-12git add: Add the "--ignore-missing" option for the dry runLibravatar Jens Lehmann5-6/+47
2010-07-12test-lib: TAP compliance for skipping tests on requestLibravatar Michael J Gruber1-2/+2
2010-07-12test-lib: simplify GIT_SKIP_TESTS loopLibravatar Michael J Gruber1-10/+3
2010-07-11Merge branch 'maint'Libravatar Junio C Hamano3-2/+3
2010-07-11t3000 (ls-files -o): modernize styleLibravatar Jonathan Nieder1-47/+42
2010-07-10git-gui: fix usage of themed widgets variableLibravatar Heiko Voigt1-0/+1
2010-07-10git-gui: Handle failure of core.worktree to identify the working directory.Libravatar Pat Thoyts1-0/+3
2010-07-09Documentation: Spelling fix in protocol-capabilities.txtLibravatar Fredrik Skolmli1-1/+1
2010-07-09merge-recursive: use "up-to-date" instead of "uptodate" in error message for ...Libravatar Nicolas Sebrecht1-1/+1
2010-07-09checkout: accord documentation to what git doesLibravatar Nicolas Sebrecht1-1/+1
2010-07-09t0005: work around strange $? in ksh when program terminated by a signalLibravatar Johannes Sixt1-0/+1
2010-07-08Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fixLibravatar Junio C Hamano997-17105/+82957
2010-07-08diff.c: fix a graph output bugLibravatar Bo Yang1-2/+1
2010-07-08tests: Use skip_all=* to skip testsLibravatar Ævar Arnfjörð Bjarmason7-18/+17
2010-07-08Fix "read-tree -m A B" priming the cache-treeLibravatar Junio C Hamano2-5/+16
2010-07-08Reorganize `git-log' man page to clarify common diff options.Libravatar Eli Barzilay1-6/+9
2010-07-08t9118 (git-svn): prevent early failure from taking down later testsLibravatar Jonathan Nieder1-21/+25
2010-07-08t9118: avoid PEG revision identifier in testsLibravatar Michael J Gruber1-1/+1
2010-07-07grep -O: Do not pass color sequences as filenames to pagerLibravatar Nazri Ramliy2-0/+16
2010-07-07Git 1.7.2-rc2Libravatar Junio C Hamano1-14/+4
2010-07-07Merge branch 'ab/tap'Libravatar Junio C Hamano46-111/+369
2010-07-07Merge branch 'maint'Libravatar Junio C Hamano4-8/+54
2010-07-07backmerge a few more fixes to 1.7.1.X seriesLibravatar Junio C Hamano2-1/+20
2010-07-07Merge branch 'maint-1.6.4' into maintLibravatar Junio C Hamano2-2/+20