aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'zj/decimal-width'Junio C Hamano2012-02-20
|\
| * make lineno_width() from blame reusable for othersZbigniew Jędrzejewski-Szmek2012-02-14
* | Merge branch 'cb/transfer-no-progress'Junio C Hamano2012-02-20
|\ \
| * | push/fetch/clone --no-progress suppresses progress outputClemens Buchacher2012-02-13
| |/
| * Merge branch 'js/add-e-submodule-fix' into maintJunio C Hamano2012-02-13
| |\
| * \ Merge branch 'jc/parse-date-raw' into maintJunio C Hamano2012-02-13
| |\ \
| * \ \ Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintJunio C Hamano2012-02-13
| |\ \ \
| * \ \ \ Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano2012-02-13
| |\ \ \ \
| * \ \ \ \ Merge branch 'tr/grep-l-with-decoration' into maintJunio C Hamano2012-02-10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cb/push-quiet' into maintJunio C Hamano2012-02-05
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'cb/receive-pack-keep-errors'Junio C Hamano2012-02-20
|\ \ \ \ \ \ \ \
| * | | | | | | | do not override receive-pack errorsClemens Buchacher2012-02-13
* | | | | | | | | Merge branch 'cb/maint-rev-list-verify-object'Junio C Hamano2012-02-20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git rev-list: fix invalid typecastClemens Buchacher2012-02-13
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/git-dir-lookup'Junio C Hamano2012-02-14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | standardize and improve lookup rules for external local reposJeff King2012-02-02
* | | | | | | | | | Merge branch 'jk/grep-binary-attribute'Junio C Hamano2012-02-14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | grep: pre-load userdiff drivers when threadedJeff King2012-02-02
| * | | | | | | | | | convert git-grep to use grep_source interfaceJeff King2012-02-02
| * | | | | | | | | | grep: move sha1-reading mutex into low-level codeJeff King2012-02-02
| * | | | | | | | | | grep: make locking flag globalJeff King2012-02-02
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/pack-objects-parseopt'Junio C Hamano2012-02-14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pack-objects: convert to use parse_options()Nguyễn Thái Ngọc Duy2012-02-01
| * | | | | | | | | | pack-objects: remove bogus commentNguyễn Thái Ngọc Duy2012-02-01
| * | | | | | | | | | pack-objects: do not accept "--index-version=version,"Nguyễn Thái Ngọc Duy2012-02-01
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mh/war-on-extra-refs'Junio C Hamano2012-02-14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clone: do not add alternate references to extra_refsMichael Haggerty2012-02-12
| * | | | | | | | | | everything_local(): mark alternate refs as completeMichael Haggerty2012-02-12
| * | | | | | | | | | fetch-pack.c: inline insert_alternate_refs()Michael Haggerty2012-02-12
| * | | | | | | | | | fetch-pack.c: rename some parameters from "path" to "refname"Michael Haggerty2012-02-12
| * | | | | | | | | | clone.c: move more code into the "if (refs)" conditionalMichael Haggerty2012-02-12
* | | | | | | | | | | Merge branch 'jk/userdiff-config-simplify'Junio C Hamano2012-02-14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | drop odd return value semantics from userdiff_configJeff King2012-02-07
* | | | | | | | | | | | Merge branch 'jc/checkout-out-of-unborn'Junio C Hamano2012-02-12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git checkout -b: allow switching out of an unborn branchJunio C Hamano2012-02-06
* | | | | | | | | | | | | Merge branch 'nd/diffstat-gramnum'Junio C Hamano2012-02-12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy2012-02-03
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'nd/cache-tree-api-refactor'Junio C Hamano2012-02-12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | cache-tree: update API to take abitrary flagsNguyễn Thái Ngọc Duy2012-02-07
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jk/maint-tag-show-fixes'Junio C Hamano2012-02-12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tag: do not show non-tag contents with "-n"Junio C Hamano2012-02-08
| * | | | | | | | | | | | | tag: die when listing missing or corrupt objectsJeff King2012-02-06
| * | | | | | | | | | | | | tag: fix output of "tag -n" when errors occurJeff King2012-02-06
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jn/merge-no-edit-fix'Junio C Hamano2012-02-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | merge: do not launch an editor on "--no-edit $tag"Junio C Hamano2012-02-09
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'js/add-e-submodule-fix'Junio C Hamano2012-02-10
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | add -e: do not show difference in a submodule that is merely dirtyJohannes Schindelin2012-02-07
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/parse-date-raw'Junio C Hamano2012-02-10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | parse_date(): '@' prefix forces git-timestampJunio C Hamano2012-02-03
* | | | | | | | | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Junio C Hamano2012-02-10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |