summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* zlib: wrap deflate side of the APIJunio C Hamano2011-06-102-6/+6
* Merge branch 'ab/i18n-fixup' into maintJunio C Hamano2011-05-314-20/+32
|\
| * i18n: mark init-db messages for translationÆvar Arnfjörð Bjarmason2011-04-121-5/+5
| * i18n: mark checkout plural warning for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+15
| * i18n: mark checkout --detach messages for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+3
| * i18n: mark clone nonexistent repository message for translationÆvar Arnfjörð Bjarmason2011-04-121-1/+1
| * i18n: mark merge CHERRY_PICK_HEAD messages for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+3
| * i18n: mark merge "upstream" messages for translationÆvar Arnfjörð Bjarmason2011-04-121-4/+4
| * i18n: mark merge "Could not read from" message for translationÆvar Arnfjörð Bjarmason2011-04-121-1/+1
* | Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-313-4/+21
|\ \
| * | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-222-1/+20
| * | builtin/diff.c: remove duplicated call to diff_result_code()Junio C Hamano2011-03-221-3/+1
* | | Merge branch 'jk/cherry-pick-root-with-resolve' into maintJunio C Hamano2011-05-262-5/+11
|\ \ \
| * | | revert: allow reverting a root commitJeff King2011-05-161-3/+1
| * | | cherry-pick: handle root commits with external strategiesJeff King2011-05-161-2/+10
* | | | Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano2011-05-261-0/+2
* | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maintJunio C Hamano2011-05-261-2/+7
* | | | init/clone: remove short option -L and document --separate-git-dirNguyen Thai Ngoc Duy2011-05-252-2/+2
* | | | Merge branch 'vr/merge-base-doc' into maintJunio C Hamano2011-05-161-1/+2
|\ \ \ \
| * | | | Documentation: update to git-merge-base --octopusVincent van Ravesteijn2011-04-151-1/+2
| * | | | Merge branch 'jc/index-update-if-able' into maintJunio C Hamano2011-04-032-13/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'lt/default-abbrev' into maintJunio C Hamano2011-04-031-1/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mm/maint-log-n-with-diff-filtering' into maintJunio C Hamano2011-04-031-1/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'lp/config-vername-check' into maintJunio C Hamano2011-04-031-7/+20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-apply-report-offset' into maintJunio C Hamano2011-04-011-2/+14
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-apply-no-double-patch' into maintJunio C Hamano2011-04-011-1/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge "checkout ambiguous ref bugfix" into maintJunio C Hamano2011-04-011-10/+13
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fix-add-u-unmerged' into maintJunio C Hamano2011-05-161-22/+23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-231-22/+23
* | | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into maintJunio C Hamano2011-05-161-15/+26
* | | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano2011-05-161-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | "add -p": work-around an old laziness that does not coalesce hunksJunio C Hamano2011-04-291-3/+6
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'cn/format-patch-quiet' into maintJunio C Hamano2011-05-151-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | format-patch: don't pass on the --quiet flagCarlos Martín Nieto2011-04-121-6/+10
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-141-2/+2
* | | | | | | | | | | | Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-291-1/+1
* | | | | | | | | | | | | Merge branch 'jc/pack-objects-bigfile' into maintJunio C Hamano2011-05-041-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Teach core.bigfilethreashold to pack-objectsJunio C Hamano2011-04-051-2/+6
* | | | | | | | | | | | | | Merge branch 'mg/reflog-with-options' into maintJunio C Hamano2011-05-041-13/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | reflog: fix overriding of command line optionsMichael J Gruber2011-04-011-7/+2
| * | | | | | | | | | | | | builtin/log.c: separate default and setup of cmd_log_init()Michael J Gruber2011-04-011-6/+15
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | revert: Hide '-r' option in default usageRamkumar Ramachandra2011-04-131-1/+2
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/maint-remote-mirror-safer'Junio C Hamano2011-04-061-13/+49
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | remote: deprecate --mirrorJeff King2011-03-301-1/+7
| * | | | | | | | | | | | remote: separate the concept of push and fetch mirrorsJeff King2011-03-301-13/+38
| * | | | | | | | | | | | remote: disallow some nonsensical option combinationsJeff King2011-03-301-0/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano2011-04-041-12/+36
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann2011-03-091-3/+19
| * | | | | | | | | | | | fetch/pull: recurse into submodules when necessaryJens Lehmann2011-03-091-9/+17
View Lorry Controller Status