Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | prune_remote(): exit early if there are no stale references | Michael Haggerty | 2014-11-25 | 1 | -18/+21 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'tb/config-core-filemode-check-on-broken-fs' | Junio C Hamano | 2014-12-22 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | init-db: improve the filemode trustability checktb/config-core-filemode-check-on-broken-fs | Torsten Bögershausen | 2014-11-21 | 1 | -0/+2 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'mg/add-ignore-errors' | Junio C Hamano | 2014-12-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | add: ignore only ignored filesmg/add-ignore-errors | Michael J Gruber | 2014-11-21 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'cc/interpret-trailers-more' | Junio C Hamano | 2014-12-22 | 2 | -41/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | commit: make ignore_non_trailer() non static | Christian Couder | 2014-11-10 | 1 | -46/+0 | |
| * | | | | | | | | | | | | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more | Junio C Hamano | 2014-11-10 | 2 | -41/+55 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hint | Junio C Hamano | 2014-10-28 | 1 | -16/+31 | |
| | * | | | | | | | | | | | | builtin/commit.c: extract ignore_non_trailer() helper function | Junio C Hamano | 2014-10-28 | 1 | -26/+33 | |
| | * | | | | | | | | | | | | merge & sequencer: unify codepaths that write "Conflicts:" hint | Junio C Hamano | 2014-10-24 | 1 | -13/+5 | |
| | * | | | | | | | | | | | | builtin/merge.c: drop a parameter that is never used | Junio C Hamano | 2014-10-24 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | Merge branch 'jk/push-simple' | Junio C Hamano | 2014-12-12 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | push: truly use "simple" as default, not "upstream"jk/push-simple | Jeff King | 2014-11-30 | 1 | -4/+4 | |
* | | | | | | | | | | | | | | Merge branch 'jk/colors-fix' | Junio C Hamano | 2014-12-12 | 1 | -14/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | config: fix parsing of "git config --get-color some.key -1" | Jeff King | 2014-11-20 | 1 | -14/+13 | |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'rs/clean-menu-item-defn' into maint | Junio C Hamano | 2014-11-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint | Junio C Hamano | 2014-10-29 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge branch 'jk/mbox-from-line' into maint | Junio C Hamano | 2014-10-07 | 1 | -1/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rt/push-recurse-submodule-usage-string' | Junio C Hamano | 2014-12-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | builtin/push.c: fix description of --recurse-submodules optionrt/push-recurse-submodule-usage-string | Ralf Thielow | 2014-11-18 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'sv/typofix-apply-error-message' | Junio C Hamano | 2014-12-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | apply: fix typo in an error messagesv/typofix-apply-error-message | Slavomir Vlcek | 2014-11-17 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'mh/config-copy-string-from-git-path' | Junio C Hamano | 2014-12-12 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | cmd_config(): make a copy of path obtained from git_path()mh/config-copy-string-from-git-path | Michael Haggerty | 2014-11-17 | 1 | -2/+5 | |
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'mh/config-flip-xbit-back-after-checking' | Junio C Hamano | 2014-12-05 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | create_default_files(): don't set u+x bit on $GIT_DIR/configmh/config-flip-xbit-back-after-checking | Michael Haggerty | 2014-11-18 | 1 | -1/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'rs/receive-pack-use-labs' | Junio C Hamano | 2014-12-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | use labs() for variables of type long instead of abs()rs/receive-pack-use-labs | René Scharfe | 2014-11-17 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge branch 'jh/empty-notes' | Junio C Hamano | 2014-12-05 | 1 | -123/+135 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | builtin/notes: add --allow-empty, to allow storing empty notes | Johan Herland | 2014-11-12 | 1 | -6/+11 | |
| * | | | | | | | | | | | | | | builtin/notes: split create_note() to clarify add vs. remove logic | Johan Herland | 2014-11-12 | 1 | -49/+54 | |
| * | | | | | | | | | | | | | | builtin/notes: simplify early exit code in add() | Johan Herland | 2014-11-12 | 1 | -18/+17 | |
| * | | | | | | | | | | | | | | builtin/notes: refactor note file path into struct note_data | Johan Herland | 2014-11-10 | 1 | -17/+21 | |
| * | | | | | | | | | | | | | | builtin/notes: improve naming | Johan Herland | 2014-11-10 | 1 | -55/+54 | |
| * | | | | | | | | | | | | | | builtin/notes: fix premature failure when trying to add the empty blob | Johan Herland | 2014-11-10 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/checkout-from-tree' | Junio C Hamano | 2014-12-05 | 1 | -0/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | checkout $tree: do not throw away unchanged index entriesjk/checkout-from-tree | Jeff King | 2014-11-13 | 1 | -0/+18 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | use args member of struct child_processrs/env-array-in-child-process | René Scharfe | 2014-11-10 | 1 | -25/+22 | |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jk/fetch-reflog-df-conflict' | Junio C Hamano | 2014-11-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ |