Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2012-12-13 | 1 | -3/+3 |
|\ | |||||
| * | Fix sizeof usage in get_permutations | Matthew Daley | 2012-12-13 | 1 | -3/+3 |
| * | Merge branch 'jc/same-encoding' into maint | Junio C Hamano | 2012-12-07 | 1 | -1/+2 |
| |\ | |||||
* | \ | Merge branch 'jk/send-email-sender-prompt' | Junio C Hamano | 2012-11-29 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | ident: keep separate "explicit" flags for author and committer | Jeff King | 2012-11-15 | 1 | -2/+2 |
* | | | | Merge branch 'jl/submodule-rm' | Junio C Hamano | 2012-11-29 | 1 | -0/+15 |
|\ \ \ \ | |||||
| * | | | | Teach rm to remove submodules when given with a trailing '/' | Jens Lehmann | 2012-11-23 | 1 | -0/+15 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2012-11-26 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Fix typo in remote set-head usage | Antoine Pelisse | 2012-11-26 | 1 | -1/+1 |
| * | | | | Merge branch 'jk/checkout-out-of-unborn' into maint | Junio C Hamano | 2012-11-25 | 1 | -0/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'cn/config-missing-path' into maint | Junio C Hamano | 2012-11-25 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'rs/branch-del-symref' into maint | Junio C Hamano | 2012-11-18 | 1 | -26/+49 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'nd/grep-true-path' into maint | Junio C Hamano | 2012-11-18 | 1 | -13/+18 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'jk/config-ignore-duplicates' | Junio C Hamano | 2012-11-21 | 1 | -65/+43 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | builtin/config.c: Fix a sparse warning | Ramsay Jones | 2012-10-29 | 1 | -1/+1 |
| * | | | | | | | | | git-config: use git_config_with_options | Jeff King | 2012-10-24 | 1 | -42/+2 |
| * | | | | | | | | | git-config: do not complain about duplicate entries | Jeff King | 2012-10-24 | 1 | -18/+9 |
| * | | | | | | | | | git-config: collect values instead of immediately printing | Jeff King | 2012-10-24 | 1 | -15/+35 |
| * | | | | | | | | | git-config: fix regexp memory leaks on error conditions | Jeff King | 2012-10-24 | 1 | -10/+13 |
| * | | | | | | | | | git-config: remove memory leak of key regexp | Jeff King | 2012-10-24 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch 'jk/checkout-out-of-unborn' | Junio C Hamano | 2012-11-20 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | checkout: print a message when switching unborn branches | Jeff King | 2012-11-15 | 1 | -0/+3 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'cn/config-missing-path' | Junio C Hamano | 2012-11-20 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | config: don't segfault when given --path with a missing value | Carlos Martín Nieto | 2012-11-15 | 1 | -1/+2 |
* | | | | | | | | | Merge branch 'mg/replace-resolve-delete' | Junio C Hamano | 2012-11-20 | 1 | -6/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | replace: parse revision argument for -d | Michael J Gruber | 2012-11-13 | 1 | -6/+9 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'kb/preload-index-more' | Junio C Hamano | 2012-11-20 | 3 | -6/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | update-index/diff-index: use core.preloadindex to improve performance | Karsten Blees | 2012-11-02 | 3 | -6/+15 |
* | | | | | | | | | | Merge branch 'jc/prettier-pretty-note' | Junio C Hamano | 2012-11-15 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | pretty: remove reencode_commit_message() | Junio C Hamano | 2012-10-17 | 1 | -2/+3 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jc/same-encoding' | Junio C Hamano | 2012-11-15 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | reencode_string(): introduce and use same_encoding() | Junio C Hamano | 2012-11-04 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jh/symbolic-ref-d' | Junio C Hamano | 2012-11-15 | 1 | -10/+23 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | git symbolic-ref --delete $symref | Johan Herland | 2012-10-21 | 1 | -10/+23 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/builtin-to-libgit' | Jeff King | 2012-11-09 | 5 | -1448/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch-pack: move core code to libgit.a | Nguyễn Thái Ngọc Duy | 2012-10-29 | 1 | -948/+0 |
| * | | | | | | | | fetch-pack: remove global (static) configuration variable "args" | Nguyễn Thái Ngọc Duy | 2012-10-29 | 1 | -77/+83 |
| * | | | | | | | | send-pack: move core code to libgit.a | Nguyễn Thái Ngọc Duy | 2012-10-29 | 1 | -333/+0 |
| * | | | | | | | | Move setup_diff_pager to libgit.a | Nguyễn Thái Ngọc Duy | 2012-10-29 | 1 | -16/+0 |
| * | | | | | | | | Move print_commit_list to libgit.a | Nguyễn Thái Ngọc Duy | 2012-10-29 | 1 | -10/+0 |
| * | | | | | | | | Move estimate_bisect_steps to libgit.a | Nguyễn Thái Ngọc Duy | 2012-10-29 | 1 | -39/+0 |
| * | | | | | | | | Move try_merge_command and checkout_fast_forward to libgit.a | Nguyễn Thái Ngọc Duy | 2012-10-29 | 1 | -104/+2 |
* | | | | | | | | | Merge branch 'rs/branch-del-symref' | Jeff King | 2012-10-29 | 1 | -26/+49 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | branch: show targets of deleted symrefs, not sha1s | René Scharfe | 2012-10-18 | 1 | -8/+11 |
| * | | | | | | | | branch: skip commit checks when deleting symref branches | René Scharfe | 2012-10-18 | 1 | -2/+8 |
| * | | | | | | | | branch: delete symref branch, not its target | René Scharfe | 2012-10-18 | 1 | -1/+1 |
| * | | | | | | | | branch: factor out delete_branch_config() | René Scharfe | 2012-10-18 | 1 | -5/+10 |
| * | | | | | | | | branch: factor out check_branch_commit() | René Scharfe | 2012-10-18 | 1 | -12/+21 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/status-long' | Jeff King | 2012-10-29 | 1 | -6/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | status: add --long output format option | Jeff King | 2012-10-18 | 1 | -6/+23 |
| |/ / / / / / / |