summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | system_path(): always return free'able memory to the callerjc/exec-cmd-system-path-leak-fixJunio C Hamano2014-11-302-7/+17
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'pb/am-message-id-footer'Junio C Hamano2014-12-221-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-mailinfo: add --message-idPaolo Bonzini2014-11-251-1/+21
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mh/simplify-repack-without-refs'Junio C Hamano2014-12-224-40/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sort_string_list(): rename to string_list_sort()mh/simplify-repack-without-refsMichael Haggerty2014-11-254-9/+9
| * | | | | | | | | | | | | prune_remote(): iterate using for_each_string_list_item()Michael Haggerty2014-11-251-8/+6
| * | | | | | | | | | | | | prune_remote(): rename local variableMichael Haggerty2014-11-251-6/+6
| * | | | | | | | | | | | | repack_without_refs(): make the refnames argument a string_listMichael Haggerty2014-11-251-12/+2
| * | | | | | | | | | | | | prune_remote(): sort delete_refs_list references en masseMichael Haggerty2014-11-251-1/+2
| * | | | | | | | | | | | | prune_remote(): initialize both delete_refs lists in a single loopMichael Haggerty2014-11-251-6/+9
| * | | | | | | | | | | | | prune_remote(): exit early if there are no stale referencesMichael Haggerty2014-11-251-18/+21
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'tb/config-core-filemode-check-on-broken-fs'Junio C Hamano2014-12-221-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | init-db: improve the filemode trustability checktb/config-core-filemode-check-on-broken-fsTorsten Bögershausen2014-11-211-0/+2
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mg/add-ignore-errors'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add: ignore only ignored filesmg/add-ignore-errorsMichael J Gruber2014-11-211-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'cc/interpret-trailers-more'Junio C Hamano2014-12-222-41/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | commit: make ignore_non_trailer() non staticChristian Couder2014-11-101-46/+0
| * | | | | | | | | | | | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano2014-11-102-41/+55
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hintJunio C Hamano2014-10-281-16/+31
| | * | | | | | | | | | | | builtin/commit.c: extract ignore_non_trailer() helper functionJunio C Hamano2014-10-281-26/+33
| | * | | | | | | | | | | | merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano2014-10-241-13/+5
| | * | | | | | | | | | | | builtin/merge.c: drop a parameter that is never usedJunio C Hamano2014-10-241-2/+2
* | | | | | | | | | | | | | Merge branch 'jk/push-simple'Junio C Hamano2014-12-121-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | push: truly use "simple" as default, not "upstream"jk/push-simpleJeff King2014-11-301-4/+4
* | | | | | | | | | | | | | Merge branch 'jk/colors-fix'Junio C Hamano2014-12-121-14/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | config: fix parsing of "git config --get-color some.key -1"Jeff King2014-11-201-14/+13
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'rs/clean-menu-item-defn' into maintJunio C Hamano2014-11-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintJunio C Hamano2014-10-291-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'jk/mbox-from-line' into maintJunio C Hamano2014-10-071-1/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rt/push-recurse-submodule-usage-string'Junio C Hamano2014-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | builtin/push.c: fix description of --recurse-submodules optionrt/push-recurse-submodule-usage-stringRalf Thielow2014-11-181-1/+1
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sv/typofix-apply-error-message'Junio C Hamano2014-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | apply: fix typo in an error messagesv/typofix-apply-error-messageSlavomir Vlcek2014-11-171-1/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'mh/config-copy-string-from-git-path'Junio C Hamano2014-12-121-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | cmd_config(): make a copy of path obtained from git_path()mh/config-copy-string-from-git-pathMichael Haggerty2014-11-171-2/+5
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'mh/config-flip-xbit-back-after-checking'Junio C Hamano2014-12-051-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | create_default_files(): don't set u+x bit on $GIT_DIR/configmh/config-flip-xbit-back-after-checkingMichael Haggerty2014-11-181-1/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rs/receive-pack-use-labs'Junio C Hamano2014-12-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | use labs() for variables of type long instead of abs()rs/receive-pack-use-labsRené Scharfe2014-11-171-1/+1
* | | | | | | | | | | | | | Merge branch 'jh/empty-notes'Junio C Hamano2014-12-051-123/+135
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | builtin/notes: add --allow-empty, to allow storing empty notesJohan Herland2014-11-121-6/+11
| * | | | | | | | | | | | | | builtin/notes: split create_note() to clarify add vs. remove logicJohan Herland2014-11-121-49/+54
| * | | | | | | | | | | | | | builtin/notes: simplify early exit code in add()Johan Herland2014-11-121-18/+17
| * | | | | | | | | | | | | | builtin/notes: refactor note file path into struct note_dataJohan Herland2014-11-101-17/+21
| * | | | | | | | | | | | | | builtin/notes: improve namingJohan Herland2014-11-101-55/+54
| * | | | | | | | | | | | | | builtin/notes: fix premature failure when trying to add the empty blobJohan Herland2014-11-101-1/+1
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/checkout-from-tree'Junio C Hamano2014-12-051-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | checkout $tree: do not throw away unchanged index entriesjk/checkout-from-treeJeff King2014-11-131-0/+18
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | use args member of struct child_processrs/env-array-in-child-processRené Scharfe2014-11-101-25/+22
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano2014-11-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \