summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Allow custom "comment char"Junio C Hamano2013-01-167-60/+86
* Merge branch 'nd/maint-branch-desc-doc'Junio C Hamano2013-01-092-14/+24
|\
| * format-patch: pick up branch description when no ref is specifiedNguyễn Thái Ngọc Duy2013-01-031-3/+16
| * format-patch: pick up correct branch name from symbolic refNguyễn Thái Ngọc Duy2013-01-031-12/+9
| * branch: delete branch description if it's emptyNguyễn Thái Ngọc Duy2013-01-031-1/+1
* | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'Junio C Hamano2013-01-091-2/+3
|\ \
| * | merge: Honor prepare-commit-msg return codeAntoine Pelisse2013-01-031-2/+3
* | | Merge branch 'jc/apply-trailing-blank-removal'Junio C Hamano2013-01-061-6/+17
|\ \ \
| * | | apply.c:update_pre_post_images(): the preimage can be truncatedJunio C Hamano2012-10-121-6/+17
* | | | Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-052-14/+27
|\ \ \ \
| * | | | push: allow already-exists advice to be disabledChris Rorvick2012-12-031-0/+2
| * | | | push: rename config variable for more general useChris Rorvick2012-12-031-3/+3
| * | | | push: require force for refs under refs/tags/Chris Rorvick2012-12-022-1/+6
| * | | | push: add advice for rejected tag referenceChris Rorvick2012-12-021-0/+11
| * | | | push: return reject reasons as a bitsetChris Rorvick2012-12-022-11/+6
* | | | | Merge branch 'fc/fast-export-fixes'Junio C Hamano2013-01-051-8/+19
|\ \ \ \ \
| * | | | | fast-export: make sure updated refs get updatedFelipe Contreras2012-12-031-3/+7
| * | | | | fast-export: don't handle uninteresting refsFelipe Contreras2012-12-031-4/+7
| * | | | | fast-export: trivial cleanupFelipe Contreras2012-11-291-1/+1
| * | | | | fast-export: avoid importing blob marksFelipe Contreras2012-11-261-0/+4
* | | | | | Merge branch 'nd/pathspec-wildcard'Junio C Hamano2013-01-052-2/+2
|\ \ \ \ \ \
| * | | | | | pathspec: save the non-wildcard length partNguyễn Thái Ngọc Duy2012-11-192-2/+2
* | | | | | | Merge branch 'sp/shortlog-missing-lf'Junio C Hamano2013-01-021-3/+2
|\ \ \ \ \ \ \
| * | | | | | | shortlog: fix wrapping lines of wraplenSteffen Prohaska2012-12-111-3/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'maint'Junio C Hamano2012-12-131-3/+3
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fix sizeof usage in get_permutationsMatthew Daley2012-12-131-3/+3
| * | | | | | Merge branch 'jc/same-encoding' into maintJunio C Hamano2012-12-071-1/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jk/send-email-sender-prompt'Junio C Hamano2012-11-291-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | ident: keep separate "explicit" flags for author and committerJeff King2012-11-151-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jl/submodule-rm'Junio C Hamano2012-11-291-0/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Teach rm to remove submodules when given with a trailing '/'Jens Lehmann2012-11-231-0/+15
* | | | | | | | | Merge branch 'maint'Junio C Hamano2012-11-261-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Fix typo in remote set-head usageAntoine Pelisse2012-11-261-1/+1
| * | | | | | | | Merge branch 'jk/checkout-out-of-unborn' into maintJunio C Hamano2012-11-251-0/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'cn/config-missing-path' into maintJunio C Hamano2012-11-251-1/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/branch-del-symref' into maintJunio C Hamano2012-11-181-26/+49
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/grep-true-path' into maintJunio C Hamano2012-11-181-13/+18
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-ignore-duplicates'Junio C Hamano2012-11-211-65/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | builtin/config.c: Fix a sparse warningRamsay Jones2012-10-291-1/+1
| * | | | | | | | | | | | git-config: use git_config_with_optionsJeff King2012-10-241-42/+2
| * | | | | | | | | | | | git-config: do not complain about duplicate entriesJeff King2012-10-241-18/+9
| * | | | | | | | | | | | git-config: collect values instead of immediately printingJeff King2012-10-241-15/+35
| * | | | | | | | | | | | git-config: fix regexp memory leaks on error conditionsJeff King2012-10-241-10/+13
| * | | | | | | | | | | | git-config: remove memory leak of key regexpJeff King2012-10-241-0/+4
* | | | | | | | | | | | | Merge branch 'jk/checkout-out-of-unborn'Junio C Hamano2012-11-201-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | checkout: print a message when switching unborn branchesJeff King2012-11-151-0/+3
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'cn/config-missing-path'Junio C Hamano2012-11-201-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | config: don't segfault when given --path with a missing valueCarlos Martín Nieto2012-11-151-1/+2
* | | | | | | | | | | | Merge branch 'mg/replace-resolve-delete'Junio C Hamano2012-11-201-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | replace: parse revision argument for -dMichael J Gruber2012-11-131-6/+9
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
View Lorry Controller Status