summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Export parse_date_basic() to convert a date string to timestampJonathan Nieder2010-07-152-8/+7
* Merge branch 'jn/paginate-fix'Junio C Hamano2010-07-152-46/+200
|\
| * git --paginate: paginate external commands againJonathan Nieder2010-07-142-12/+38
| * git --paginate: do not commit pager choice too earlyNguyễn Thái Ngọc Duy2010-06-282-13/+47
| * tests: local config file should be honored from subdirs of toplevelJonathan Nieder2010-06-281-0/+26
| * t7006: test pager configuration for several git commandsJonathan Nieder2010-06-281-52/+84
| * t7006 (pager): introduce helper for parameterized testsJonathan Nieder2010-06-281-18/+54
* | Merge branch 'wp/merge-tree-fix'Junio C Hamano2010-07-152-1/+259
|\ \
| * | merge-tree: fix where two branches share no changesWill Palmer2010-07-142-4/+5
| * | add basic tests for merge-treeWill Palmer2010-07-141-0/+257
* | | Merge branch 'js/merge-rr-fix'Junio C Hamano2010-07-152-3/+3
|\ \ \
| * | | MERGE_RR is in .git, not .git/rr-cacheJay Soffian2010-07-142-3/+3
| |/ /
* | | Merge branch 'jc/diff-merge-base-multi'Junio C Hamano2010-07-151-8/+23
|\ \ \
| * | | diff A...B: give one possible diff when there are more than one merge-baseJunio C Hamano2010-07-131-8/+23
* | | | Merge branch 'ns/merge-recursive-uptodate'Junio C Hamano2010-07-151-1/+1
|\ \ \ \
| * | | | merge-recursive: use "up-to-date" instead of "uptodate" in error message for ...Nicolas Sebrecht2010-07-091-1/+1
* | | | | Merge branch 'jn/tests'Junio C Hamano2010-07-151-47/+42
|\ \ \ \ \
| * | | | | t3000 (ls-files -o): modernize styleJonathan Nieder2010-07-111-47/+42
| |/ / / /
* | | | | Merge branch 'eb/doc-log-manpage'Junio C Hamano2010-07-151-6/+9
|\ \ \ \ \
| * | | | | Reorganize `git-log' man page to clarify common diff options.Eli Barzilay2010-07-081-6/+9
| |/ / / /
* | | | | Merge branch 'jn/grep-open'Junio C Hamano2010-07-152-0/+16
|\ \ \ \ \
| * | | | | grep -O: Do not pass color sequences as filenames to pagerNazri Ramliy2010-07-072-0/+16
* | | | | | Merge branch 'mg/revision-doc'Junio C Hamano2010-07-1520-222/+257
|\ \ \ \ \ \
| * | | | | | Documentation: link to gitrevisions rather than git-rev-parseMichael J Gruber2010-07-0516-22/+21
| * | | | | | Documentation: gitrevisionsMichael J Gruber2010-07-052-1/+36
| * | | | | | Documentation: split off rev doc into include fileMichael J Gruber2010-07-052-199/+200
* | | | | | | Merge branch 'jk/maint-status-keep-index-timestamp'Junio C Hamano2010-07-151-5/+11
|\ \ \ \ \ \ \
| * | | | | | | do not write out index when status does not have toJunio C Hamano2010-07-061-5/+11
* | | | | | | | Merge branch 'jc/rebase-i-commit-msg-fix'Junio C Hamano2010-07-152-9/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase-i: do not get fooled by a log message ending with backslashJunio C Hamano2010-07-052-5/+23
| * | | | | | | | rebase-i: style fixJunio C Hamano2010-07-051-5/+6
* | | | | | | | | Merge branch 'ab/submodule-add-f'Junio C Hamano2010-07-153-3/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git submodule: add submodules with git add -f <path>Ævar Arnfjörð Bjarmason2010-07-053-3/+29
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bc/maint-makefile-fixes'Junio C Hamano2010-07-151-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: work around ksh's failure to handle missing list argument to for loopBrandon Casey2010-07-061-3/+3
| * | | | | | | | | Makefile: remove some unnecessary curly bracesBrandon Casey2010-07-051-4/+4
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-07-153-2/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: add submodule.* to the big configuration variable listJonathan Nieder2010-07-151-0/+9
| * | | | | | | | | | gitmodules.5: url can be a relative pathJonathan Nieder2010-07-151-0/+3
| * | | | | | | | | | gitweb: fix esc_urlPavan Kumar Sunkara2010-07-151-2/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Git 1.7.2-rc3v1.7.2-rc3Junio C Hamano2010-07-141-1/+4
* | | | | | | | | | Merge branch 'jc/read-tree-cache-tree-fix'Junio C Hamano2010-07-142-5/+16
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fixJunio C Hamano2010-07-08997-17105/+82957
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Fix "read-tree -m A B" priming the cache-treeJunio C Hamano2010-07-082-5/+16
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()Raja R Harinath2010-07-141-1/+2
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-07-132-2/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | git fetch documentation: describe short '-p' synonym to '--prune' optionOren Held2010-07-131-0/+1
| * | | | | | | | | format-patch: document the format.to configuration settingMiklos Vajna2010-07-131-2/+4
* | | | | | | | | | test-lib: TAP compliance for skipping tests on requestMichael J Gruber2010-07-121-2/+2
* | | | | | | | | | test-lib: simplify GIT_SKIP_TESTS loopMichael J Gruber2010-07-121-10/+3
View Lorry Controller Status