summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2015-05-05Merge branch 'bc/object-id'Junio C Hamano2-24/+24
2015-05-05prefix_path(): unconditionally free results in the callersStefan Beller2-13/+10
2015-05-05hash-object --literally: fix buffer overrun with extra-long object typeEric Sunshine1-3/+1
2015-05-04config: use error() instead of fprintf(stderr, ...)Jonathan Nieder1-2/+2
2015-05-03blame, log: format usage strings similarly to those in documentationAlex Henrie2-2/+2
2015-05-03blame: CRLF in the working tree and LF in the repoTorsten Bögershausen1-0/+1
2015-04-29merge: drop 'git merge <message> HEAD <commit>' syntaxJunio C Hamano1-50/+9
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano1-0/+1
2015-04-29merge: handle FETCH_HEAD internallyJunio C Hamano1-34/+72
2015-04-29merge: decide if we auto-generate the message early in collect_parents()Junio C Hamano1-7/+9
2015-04-29merge: make collect_parents() auto-generate the merge messageJunio C Hamano1-14/+22
2015-04-29merge: extract prepare_merge_message() logic outJunio C Hamano1-11/+15
2015-04-29merge: narrow scope of merge_namesJunio C Hamano1-4/+7
2015-04-29merge: split reduce_parents() out of collect_parents()Junio C Hamano1-16/+25
2015-04-29merge: clarify collect_parents() logicJunio C Hamano1-2/+11
2015-04-29merge: small leakfix and code simplificationJunio C Hamano1-2/+2
2015-04-29merge: do not check argc to determine number of remote headsJunio C Hamano1-3/+2
2015-04-29merge: clarify "pulling into void" special caseJunio C Hamano1-17/+18
2015-04-29merge: simplify code flowJunio C Hamano1-8/+8
2015-04-20Merge branch 'ps/grep-help-all-callback-arg'Junio C Hamano1-1/+1
2015-04-20fmt-merge-msg: plug small leak of commit bufferJunio C Hamano1-5/+11
2015-04-18index-pack: kill union delta_base to save memoryNguyễn Thái Ngọc Duy1-98/+158
2015-04-17config: fix settings in default_user_config templateOssi Herrala1-2/+2
2015-04-16Revert "merge: pass verbosity flag down to merge-recursive"Junio C Hamano1-4/+0
2015-04-14Merge branch 'jk/merge-quiet'Junio C Hamano1-0/+4
2015-04-14Merge branch 'jc/update-instead-into-void'Junio C Hamano1-1/+20
2015-04-12grep: correctly initialize help-all optionPatrick Steinhardt1-1/+1
2015-04-02checkout: call a single commit "it" intead of "them"Thomas Schneider1-2/+9
2015-04-02merge: pass verbosity flag down to merge-recursiveJeff King1-0/+4
2015-04-02init: don't set core.worktree when initializing /.gitJeff King1-3/+15
2015-04-01push-to-deploy: allow pushing into an unborn branch and updating itJunio C Hamano1-1/+20
2015-03-31Merge branch 'jc/report-path-error-to-dir' into maintJunio C Hamano1-43/+0
2015-03-31show-branch: show all local heads when only giving one rev along --topicsMike Hommey1-3/+3
2015-03-31prune --worktrees: fix expire vs worktree existence conditionMax Kirillov1-3/+7
2015-03-30sha1_file: squelch "packfile cannot be accessed" warningsJeff King1-3/+1
2015-03-28Merge branch 'ws/grep-quiet-no-pager' into maintJunio C Hamano1-1/+1
2015-03-28Merge branch 'jk/cleanup-failed-clone' into maintJunio C Hamano1-5/+6
2015-03-28Merge branch 'jk/prune-with-corrupt-refs' into maintJunio C Hamano2-2/+7
2015-03-27Merge branch 'sb/leaks'Junio C Hamano3-3/+8
2015-03-27Merge branch 'jk/tag-h-column-is-a-listing-option' into maintJunio C Hamano1-2/+2
2015-03-26Merge branch 'jc/report-path-error-to-dir'Junio C Hamano1-43/+0
2015-03-25Merge branch 'jk/prune-with-corrupt-refs'Junio C Hamano2-2/+7
2015-03-25Merge branch 'jk/cleanup-failed-clone'Junio C Hamano1-5/+6
2015-03-25Merge branch 'ws/grep-quiet-no-pager'Junio C Hamano1-1/+1
2015-03-24report_path_error(): move to dir.cJunio C Hamano1-43/+0
2015-03-23diff-lib.c: adjust position of i-t-a entries in diffNguyễn Thái Ngọc Duy1-0/+1
2015-03-23Merge branch 'jk/push-config'Junio C Hamano1-8/+13
2015-03-23Merge branch 'jk/tag-h-column-is-a-listing-option'Junio C Hamano1-2/+2
2015-03-23Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano2-3/+0
2015-03-23commit.c: fix a memory leakStefan Beller1-2/+4