Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository' | Junio C Hamano | 2015-01-12 | 1 | -1/+6 |
|\ | |||||
| * | pack-objects: use --objects-edge-aggressive for shallow reposbc/fetch-thin-less-aggressive-in-normal-repository | brian m. carlson | 2014-12-29 | 1 | -1/+6 |
| * | rev-list: add an option to mark fewer edges as uninteresting | brian m. carlson | 2014-12-29 | 1 | -1/+1 |
* | | Merge branch 'rs/simplify-parsing-commit-tree-S' | Junio C Hamano | 2015-01-12 | 1 | -3/+1 |
|\ \ | |||||
| * | | commit-tree: simplify parsing of option -S using skip_prefix()rs/simplify-parsing-commit-tree-S | René Scharfe | 2014-12-29 | 1 | -3/+1 |
* | | | Merge branch 'rs/plug-strbuf-leak-in-merge' | Junio C Hamano | 2015-01-12 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | merge: release strbuf after use in suggest_conflicts()rs/plug-strbuf-leak-in-merge | René Scharfe | 2014-12-29 | 1 | -0/+1 |
* | | | | Merge branch 'es/checkout-index-temp' | Junio C Hamano | 2015-01-12 | 1 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | checkout-index: fix --temp relative path manglinges/checkout-index-temp | Eric Sunshine | 2014-12-29 | 1 | -8/+8 |
* | | | | | Merge branch 'jc/merge-bases' | Junio C Hamano | 2015-01-07 | 3 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | get_merge_bases(): always clean-up object flagsjc/merge-bases | Junio C Hamano | 2014-10-30 | 3 | -5/+5 |
| |/ / / / | |||||
* | | | | | Merge branch 'jc/clone-borrow' | Junio C Hamano | 2015-01-07 | 1 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | clone: --dissociate option to mark that reference is only temporaryjc/clone-borrow | Junio C Hamano | 2014-10-15 | 1 | -0/+20 |
* | | | | | | Merge branch 'mh/update-ref-verify' | Junio C Hamano | 2014-12-29 | 1 | -9/+5 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | update-ref: fix "verify" command with missing <oldvalue>mh/update-ref-verify | Michael Haggerty | 2014-12-11 | 1 | -9/+5 |
* | | | | | | Sync with maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'jk/push-simple' into maint | Junio C Hamano | 2014-12-22 | 1 | -4/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'mh/config-flip-xbit-back-after-checking' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'rs/receive-pack-use-labs' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/colors-fix' into maint | Junio C Hamano | 2014-12-22 | 1 | -14/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/checkout-from-tree' into maint | Junio C Hamano | 2014-12-22 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | clean: typofix | Alexander Kuleshov | 2014-12-22 | 1 | -1/+1 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs/use-strbuf-complete-line' | Junio C Hamano | 2014-12-22 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | use strbuf_complete_line() for adding a newline if neededrs/use-strbuf-complete-line | René Scharfe | 2014-12-12 | 1 | -2/+1 |
* | | | | | | | | | | | Merge branch 'jk/commit-date-approxidate' | Junio C Hamano | 2014-12-22 | 1 | -30/+18 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | commit: always populate GIT_AUTHOR_* variablesjk/commit-date-approxidate | Jeff King | 2014-12-11 | 1 | -21/+5 |
| * | | | | | | | | | | | commit: loosen ident checks when generating template | Jeff King | 2014-12-11 | 1 | -9/+14 |
* | | | | | | | | | | | | Merge branch 'js/fsck-tag-validation' | Junio C Hamano | 2014-12-22 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | index-pack: terminate object buffers with NULjs/fsck-tag-validation | Duy Nguyen | 2014-12-09 | 2 | -3/+3 |
* | | | | | | | | | | | | | Merge branch 'mg/branch-d-m-f' | Junio C Hamano | 2014-12-22 | 1 | -4/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | branch: allow -f with -m and -dmg/branch-d-m-f | Michael J Gruber | 2014-12-09 | 1 | -4/+9 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'nd/ls-tree-pathspec' | Junio C Hamano | 2014-12-22 | 3 | -14/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | ls-tree: disable negative pathspec because it's not supported | Nguyễn Thái Ngọc Duy | 2014-12-01 | 1 | -1/+2 |
| * | | | | | | | | | | | | | ls-tree: remove path filtering logic in show_tree | Nguyễn Thái Ngọc Duy | 2014-12-01 | 1 | -7/+7 |
| * | | | | | | | | | | | | | tree.c: update read_tree_recursive callback to pass strbuf as base | Nguyễn Thái Ngọc Duy | 2014-12-01 | 3 | -9/+10 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl' | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | for-each-ref: correct spelling of Tcl in option descriptionrt/for-each-ref-spell-tcl-as-Tcl | Ralf Thielow | 2014-11-30 | 1 | -1/+1 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'js/push-to-deploy' | Junio C Hamano | 2014-12-22 | 1 | -2/+91 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | receive-pack: add another option for receive.denyCurrentBranch | Johannes Schindelin | 2014-11-30 | 1 | -2/+91 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jc/exec-cmd-system-path-leak-fix' | Junio C Hamano | 2014-12-22 | 2 | -7/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | system_path(): always return free'able memory to the callerjc/exec-cmd-system-path-leak-fix | Junio C Hamano | 2014-11-30 | 2 | -7/+17 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'pb/am-message-id-footer' | Junio C Hamano | 2014-12-22 | 1 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | git-mailinfo: add --message-id | Paolo Bonzini | 2014-11-25 | 1 | -1/+21 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'mh/simplify-repack-without-refs' | Junio C Hamano | 2014-12-22 | 4 | -40/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | sort_string_list(): rename to string_list_sort()mh/simplify-repack-without-refs | Michael Haggerty | 2014-11-25 | 4 | -9/+9 |
| * | | | | | | | | | | | | | prune_remote(): iterate using for_each_string_list_item() | Michael Haggerty | 2014-11-25 | 1 | -8/+6 |
| * | | | | | | | | | | | | | prune_remote(): rename local variable | Michael Haggerty | 2014-11-25 | 1 | -6/+6 |
| * | | | | | | | | | | | | | repack_without_refs(): make the refnames argument a string_list | Michael Haggerty | 2014-11-25 | 1 | -12/+2 |
| * | | | | | | | | | | | | | prune_remote(): sort delete_refs_list references en masse | Michael Haggerty | 2014-11-25 | 1 | -1/+2 |
| * | | | | | | | | | | | | | prune_remote(): initialize both delete_refs lists in a single loop | Michael Haggerty | 2014-11-25 | 1 | -6/+9 |