summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/edit-branch-desc-while-detached' into maintJunio C Hamano2013-02-041-4/+4
|\
| * branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy2013-01-301-4/+4
* | Merge branch 'jc/help' into maintJunio C Hamano2013-02-041-18/+0
|\ \
| * | help: include <common-cmds.h> only in one fileJunio C Hamano2013-01-181-18/+0
* | | Merge branch 'jc/merge-blobs' into maintJunio C Hamano2013-02-042-37/+59
|\ \ \ | |/ / |/| |
| * | merge-tree: fix d/f conflictsJunio C Hamano2012-12-261-32/+40
| * | merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-261-4/+22
| * | merge-tree: lose unused "resolve_directories"Junio C Hamano2012-12-261-3/+0
| * | merge-tree: lose unused "flags" from merge_listJunio C Hamano2012-12-261-2/+1
| * | Which merge_file() function do you mean?Junio C Hamano2012-12-092-4/+4
* | | Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maintJunio C Hamano2013-01-141-1/+3
|\ \ \
| * | | clone: support atomic operation with --separate-git-dirJens Lehmann2013-01-051-1/+3
* | | | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintJunio C Hamano2013-01-142-7/+15
|\ \ \ \
| * | | | merge --no-edit: do not credit people involved in the side branchJunio C Hamano2012-12-282-7/+15
* | | | | Merge branch 'jc/apply-trailing-blank-removal' into maintJunio C Hamano2013-01-141-6/+17
|\ \ \ \ \
| * | | | | apply.c:update_pre_post_images(): the preimage can be truncatedJunio C Hamano2012-10-121-6/+17
| |/ / / /
* | | | | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maintJunio C Hamano2013-01-111-2/+3
|\ \ \ \ \
| * | | | | merge: Honor prepare-commit-msg return codeAntoine Pelisse2013-01-031-2/+3
* | | | | | Merge branch 'sp/shortlog-missing-lf' into maintJunio C Hamano2013-01-101-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
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'kb/preload-index-more'Junio C Hamano2012-11-203-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | update-index/diff-index: use core.preloadindex to improve performanceKarsten Blees2012-11-023-6/+15
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/prettier-pretty-note'Junio C Hamano2012-11-151-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pretty: remove reencode_commit_message()Junio C Hamano2012-10-171-2/+3
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
View Lorry Controller Status