summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)Author
2015-05-22Merge branch 'dl/branch-error-message'Junio C Hamano
2015-05-19Merge branch 'kn/cat-file-literally'Junio C Hamano
2015-05-19Merge branch 'jc/merge'Junio C Hamano
2015-05-19Merge branch 'nd/diff-i-t-a'Junio C Hamano
2015-05-11Merge branch 'pt/xdg-config-path'Junio C Hamano
2015-05-11Merge branch 'jc/hash-object'Junio C Hamano
2015-05-11Merge branch 'sb/prefix-path-free-results'Junio C Hamano
2015-05-11Merge branch 'jn/clean-use-error-not-fprintf-on-stderr'Junio C Hamano
2015-05-11Merge branch 'tb/blame-resurrect-convert-to-git'Junio C Hamano
2015-05-11Merge branch 'jc/plug-fmt-merge-msg-leak'Junio C Hamano
2015-05-11Merge branch 'nd/slim-index-pack-memory-usage'Junio C Hamano
2015-05-11Merge branch 'jk/sha1-file-reduce-useless-warnings'Junio C Hamano
2015-05-11Merge branch 'nd/multiple-work-trees'Junio C Hamano
2015-05-06cat-file: teach cat-file a '--allow-unknown-type' optionKarthik Nayak
2015-05-06cat-file: make the options mutually exclusiveKarthik Nayak
2015-05-06branch: do not call a "remote-tracking branch" a "remote branch"Danny Lin
2015-05-06git-config: replace use of home_config_paths()Paul Tan
2015-05-06git-commit: replace use of home_config_paths()Paul Tan
2015-05-06Merge branch 'oh/fix-config-default-user-name-section'Junio C Hamano
2015-05-06Merge branch 'ts/checkout-advice-plural'Junio C Hamano
2015-05-06Merge branch 'jk/init-core-worktree-at-root'Junio C Hamano
2015-05-06Merge branch 'mh/show-branch-topic'Junio C Hamano
2015-05-06Merge branch 'bc/object-id'Junio C Hamano
2015-05-05prefix_path(): unconditionally free results in the callersStefan Beller
2015-05-05hash-object --literally: fix buffer overrun with extra-long object typeEric Sunshine
2015-05-04config: use error() instead of fprintf(stderr, ...)Jonathan Nieder
2015-05-03blame: CRLF in the working tree and LF in the repoTorsten Bögershausen
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano
2015-04-29merge: handle FETCH_HEAD internallyJunio C Hamano
2015-04-29merge: decide if we auto-generate the message early in collect_parents()Junio C Hamano
2015-04-29merge: make collect_parents() auto-generate the merge messageJunio C Hamano
2015-04-29merge: extract prepare_merge_message() logic outJunio C Hamano
2015-04-29merge: narrow scope of merge_namesJunio C Hamano
2015-04-29merge: split reduce_parents() out of collect_parents()Junio C Hamano
2015-04-29merge: clarify collect_parents() logicJunio C Hamano
2015-04-29merge: small leakfix and code simplificationJunio C Hamano
2015-04-29merge: do not check argc to determine number of remote headsJunio C Hamano
2015-04-29merge: clarify "pulling into void" special caseJunio C Hamano
2015-04-29merge: simplify code flowJunio C Hamano
2015-04-20Merge branch 'ps/grep-help-all-callback-arg'Junio C Hamano
2015-04-20fmt-merge-msg: plug small leak of commit bufferJunio C Hamano
2015-04-19index-pack: kill union delta_base to save memoryNguyễn Thái Ngọc Duy
2015-04-17config: fix settings in default_user_config templateOssi Herrala
2015-04-16Revert "merge: pass verbosity flag down to merge-recursive"Junio C Hamano
2015-04-14Merge branch 'jk/merge-quiet'Junio C Hamano
2015-04-14Merge branch 'jc/update-instead-into-void'Junio C Hamano
2015-04-13grep: correctly initialize help-all optionPatrick Steinhardt
2015-04-02checkout: call a single commit "it" intead of "them"Thomas Schneider
2015-04-02merge: pass verbosity flag down to merge-recursiveJeff King
2015-04-02init: don't set core.worktree when initializing /.gitJeff King