summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/merge-bases'Junio C Hamano2015-01-073-5/+5
|\
| * get_merge_bases(): always clean-up object flagsjc/merge-basesJunio C Hamano2014-10-303-5/+5
* | Merge branch 'jc/clone-borrow'Junio C Hamano2015-01-071-0/+20
|\ \
| * | clone: --dissociate option to mark that reference is only temporaryjc/clone-borrowJunio C Hamano2014-10-151-0/+20
* | | Merge branch 'mh/update-ref-verify'Junio C Hamano2014-12-291-9/+5
|\ \ \
| * | | update-ref: fix "verify" command with missing <oldvalue>mh/update-ref-verifyMichael Haggerty2014-12-111-9/+5
* | | | Sync with maintJunio C Hamano2014-12-221-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'jk/push-simple' into maintJunio C Hamano2014-12-221-4/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'mh/config-flip-xbit-back-after-checking' into maintJunio C Hamano2014-12-221-1/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/receive-pack-use-labs' into maintJunio C Hamano2014-12-221-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-221-14/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/checkout-from-tree' into maintJunio C Hamano2014-12-221-0/+18
| |\ \ \ \ \ \ \ \
| * | | | | | | | | clean: typofixAlexander Kuleshov2014-12-221-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/use-strbuf-complete-line'Junio C Hamano2014-12-221-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use strbuf_complete_line() for adding a newline if neededrs/use-strbuf-complete-lineRené Scharfe2014-12-121-2/+1
* | | | | | | | | | Merge branch 'jk/commit-date-approxidate'Junio C Hamano2014-12-221-30/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit: always populate GIT_AUTHOR_* variablesjk/commit-date-approxidateJeff King2014-12-111-21/+5
| * | | | | | | | | | commit: loosen ident checks when generating templateJeff King2014-12-111-9/+14
* | | | | | | | | | | Merge branch 'js/fsck-tag-validation'Junio C Hamano2014-12-222-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-pack: terminate object buffers with NULjs/fsck-tag-validationDuy Nguyen2014-12-092-3/+3
* | | | | | | | | | | | Merge branch 'mg/branch-d-m-f'Junio C Hamano2014-12-221-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | branch: allow -f with -m and -dmg/branch-d-m-fMichael J Gruber2014-12-091-4/+9
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/ls-tree-pathspec'Junio C Hamano2014-12-223-14/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ls-tree: disable negative pathspec because it's not supportedNguyễn Thái Ngọc Duy2014-12-011-1/+2
| * | | | | | | | | | | | ls-tree: remove path filtering logic in show_treeNguyễn Thái Ngọc Duy2014-12-011-7/+7
| * | | | | | | | | | | | tree.c: update read_tree_recursive callback to pass strbuf as baseNguyễn Thái Ngọc Duy2014-12-013-9/+10
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl'Junio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | for-each-ref: correct spelling of Tcl in option descriptionrt/for-each-ref-spell-tcl-as-TclRalf Thielow2014-11-301-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'js/push-to-deploy'Junio C Hamano2014-12-221-2/+91
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | receive-pack: add another option for receive.denyCurrentBranchJohannes Schindelin2014-11-301-2/+91
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/exec-cmd-system-path-leak-fix'Junio C Hamano2014-12-222-7/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
View Lorry Controller Status