summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | 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
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/same-encoding'Junio C Hamano2012-11-151-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | reencode_string(): introduce and use same_encoding()Junio C Hamano2012-11-041-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jh/symbolic-ref-d'Junio C Hamano2012-11-151-10/+23
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | git symbolic-ref --delete $symrefJohan Herland2012-10-211-10/+23
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/builtin-to-libgit'Jeff King2012-11-095-1448/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch-pack: move core code to libgit.aNguyễn Thái Ngọc Duy2012-10-291-948/+0
| * | | | | | | | | fetch-pack: remove global (static) configuration variable "args"Nguyễn Thái Ngọc Duy2012-10-291-77/+83
| * | | | | | | | | send-pack: move core code to libgit.aNguyễn Thái Ngọc Duy2012-10-291-333/+0
| * | | | | | | | | Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy2012-10-291-16/+0
| * | | | | | | | | Move print_commit_list to libgit.aNguyễn Thái Ngọc Duy2012-10-291-10/+0
| * | | | | | | | | Move estimate_bisect_steps to libgit.aNguyễn Thái Ngọc Duy2012-10-291-39/+0
| * | | | | | | | | Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-291-104/+2
* | | | | | | | | | Merge branch 'rs/branch-del-symref'Jeff King2012-10-291-26/+49
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | branch: show targets of deleted symrefs, not sha1sRené Scharfe2012-10-181-8/+11
| * | | | | | | | | branch: skip commit checks when deleting symref branchesRené Scharfe2012-10-181-2/+8
| * | | | | | | | | branch: delete symref branch, not its targetRené Scharfe2012-10-181-1/+1
| * | | | | | | | | branch: factor out delete_branch_config()René Scharfe2012-10-181-5/+10
| * | | | | | | | | branch: factor out check_branch_commit()René Scharfe2012-10-181-12/+21
| | |/ / / / / / / | |/| | | | | | |
View Lorry Controller Status