summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2015-05-19Merge branch 'jc/merge'Libravatar Junio C Hamano1-87/+161
2015-05-19Merge branch 'nd/diff-i-t-a'Libravatar Junio C Hamano1-0/+1
2015-05-11Merge branch 'pt/xdg-config-path'Libravatar Junio C Hamano2-9/+5
2015-05-11Merge branch 'jc/hash-object'Libravatar Junio C Hamano1-3/+1
2015-05-11Merge branch 'sb/prefix-path-free-results'Libravatar Junio C Hamano2-13/+10
2015-05-11Merge branch 'jn/clean-use-error-not-fprintf-on-stderr'Libravatar Junio C Hamano1-2/+2
2015-05-11Merge branch 'tb/blame-resurrect-convert-to-git'Libravatar Junio C Hamano1-0/+1
2015-05-11Merge branch 'jc/plug-fmt-merge-msg-leak'Libravatar Junio C Hamano1-5/+11
2015-05-11Merge branch 'nd/slim-index-pack-memory-usage'Libravatar Junio C Hamano1-111/+179
2015-05-11Merge branch 'jk/sha1-file-reduce-useless-warnings'Libravatar Junio C Hamano1-3/+1
2015-05-11Merge branch 'nd/multiple-work-trees'Libravatar Junio C Hamano14-47/+413
2015-05-06git-config: replace use of home_config_paths()Libravatar Paul Tan1-4/+2
2015-05-06git-commit: replace use of home_config_paths()Libravatar Paul Tan1-5/+3
2015-05-05Merge branch 'oh/fix-config-default-user-name-section'Libravatar Junio C Hamano1-2/+2
2015-05-05Merge branch 'ts/checkout-advice-plural'Libravatar Junio C Hamano1-2/+9
2015-05-05Merge branch 'jk/init-core-worktree-at-root'Libravatar Junio C Hamano1-3/+15
2015-05-05Merge branch 'mh/show-branch-topic'Libravatar Junio C Hamano1-3/+3
2015-05-05Merge branch 'bc/object-id'Libravatar Junio C Hamano2-24/+24
2015-05-05prefix_path(): unconditionally free results in the callersLibravatar Stefan Beller2-13/+10
2015-05-05hash-object --literally: fix buffer overrun with extra-long object typeLibravatar Eric Sunshine1-3/+1
2015-05-04config: use error() instead of fprintf(stderr, ...)Libravatar Jonathan Nieder1-2/+2
2015-05-03blame: CRLF in the working tree and LF in the repoLibravatar Torsten Bögershausen1-0/+1
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxLibravatar Junio C Hamano1-0/+1
2015-04-29merge: handle FETCH_HEAD internallyLibravatar Junio C Hamano1-34/+72
2015-04-29merge: decide if we auto-generate the message early in collect_parents()Libravatar Junio C Hamano1-7/+9
2015-04-29merge: make collect_parents() auto-generate the merge messageLibravatar Junio C Hamano1-14/+22
2015-04-29merge: extract prepare_merge_message() logic outLibravatar Junio C Hamano1-11/+15
2015-04-29merge: narrow scope of merge_namesLibravatar Junio C Hamano1-4/+7
2015-04-29merge: split reduce_parents() out of collect_parents()Libravatar Junio C Hamano1-16/+25
2015-04-29merge: clarify collect_parents() logicLibravatar Junio C Hamano1-2/+11
2015-04-29merge: small leakfix and code simplificationLibravatar Junio C Hamano1-2/+2
2015-04-29merge: do not check argc to determine number of remote headsLibravatar Junio C Hamano1-3/+2
2015-04-29merge: clarify "pulling into void" special caseLibravatar Junio C Hamano1-17/+18
2015-04-29merge: simplify code flowLibravatar Junio C Hamano1-8/+8
2015-04-20Merge branch 'ps/grep-help-all-callback-arg'Libravatar Junio C Hamano1-1/+1
2015-04-20fmt-merge-msg: plug small leak of commit bufferLibravatar Junio C Hamano1-5/+11
2015-04-18index-pack: kill union delta_base to save memoryLibravatar Nguyễn Thái Ngọc Duy1-100/+160
2015-04-17config: fix settings in default_user_config templateLibravatar Ossi Herrala1-2/+2
2015-04-16Revert "merge: pass verbosity flag down to merge-recursive"Libravatar Junio C Hamano1-4/+0
2015-04-14Merge branch 'jk/merge-quiet'Libravatar Junio C Hamano1-0/+4
2015-04-14Merge branch 'jc/update-instead-into-void'Libravatar Junio C Hamano1-1/+20
2015-04-12grep: correctly initialize help-all optionLibravatar Patrick Steinhardt1-1/+1
2015-04-02checkout: call a single commit "it" intead of "them"Libravatar Thomas Schneider1-2/+9
2015-04-02merge: pass verbosity flag down to merge-recursiveLibravatar Jeff King1-0/+4
2015-04-02init: don't set core.worktree when initializing /.gitLibravatar Jeff King1-3/+15
2015-04-01push-to-deploy: allow pushing into an unborn branch and updating itLibravatar Junio C Hamano1-1/+20
2015-03-31show-branch: show all local heads when only giving one rev along --topicsLibravatar Mike Hommey1-3/+3
2015-03-31prune --worktrees: fix expire vs worktree existence conditionLibravatar Max Kirillov1-3/+7
2015-03-30sha1_file: squelch "packfile cannot be accessed" warningsLibravatar Jeff King1-3/+1
2015-03-27Merge branch 'sb/leaks'Libravatar Junio C Hamano3-3/+8