summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)Author
2013-02-25Merge branch 'jk/apply-similaritly-parsing' into maintJunio C Hamano
2013-02-25Merge branch 'zk/clean-report-failure' into maintJunio C Hamano
2013-02-25Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maintJunio C Hamano
2013-02-12Replace filepattern with pathspec for consistencyMatthieu Moy
2013-02-07Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano
2013-02-04Merge branch 'nd/edit-branch-desc-while-detached' into maintJunio C Hamano
2013-02-04Merge branch 'jc/help' into maintJunio C Hamano
2013-02-04Merge branch 'jc/merge-blobs' into maintJunio C Hamano
2013-02-03builtin/apply: tighten (dis)similarity index parsingJohn Keeping
2013-02-01apply: diagnose incomplete submodule object name betterJunio C Hamano
2013-02-01apply: simplify build_fake_ancestor()Junio C Hamano
2013-01-30branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy
2013-01-19help: include <common-cmds.h> only in one fileJunio C Hamano
2013-01-14git-clean: Display more accurate delete messagesZoltan Klinger
2013-01-14Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maintJunio C Hamano
2013-01-14Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintJunio C Hamano
2013-01-14Merge branch 'jc/apply-trailing-blank-removal' into maintJunio C Hamano
2013-01-12Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maintJunio C Hamano
2013-01-11clone: forbid --bare --separate-git-dir <dir>Nguyễn Thái Ngọc Duy
2013-01-10Merge branch 'sp/shortlog-missing-lf' into maintJunio C Hamano
2013-01-06clone: support atomic operation with --separate-git-dirJens Lehmann
2013-01-03merge: Honor prepare-commit-msg return codeAntoine Pelisse
2012-12-28merge --no-edit: do not credit people involved in the side branchJunio C Hamano
2012-12-26merge-tree: fix d/f conflictsJunio C Hamano
2012-12-26merge-tree: add comments to clarify what these functions are doingJunio C Hamano
2012-12-26merge-tree: lose unused "resolve_directories"Junio C Hamano
2012-12-26merge-tree: lose unused "flags" from merge_listJunio C Hamano
2012-12-13Merge branch 'maint'Junio C Hamano
2012-12-13Fix sizeof usage in get_permutationsMatthew Daley
2012-12-11shortlog: fix wrapping lines of wraplenSteffen Prohaska
2012-12-10Which merge_file() function do you mean?Junio C Hamano
2012-12-07Merge branch 'jc/same-encoding' into maintJunio C Hamano
2012-11-29Merge branch 'jk/send-email-sender-prompt'Junio C Hamano
2012-11-29Merge branch 'jl/submodule-rm'Junio C Hamano
2012-11-26Merge branch 'maint'Junio C Hamano
2012-11-26Fix typo in remote set-head usageAntoine Pelisse
2012-11-26Merge branch 'jk/checkout-out-of-unborn' into maintJunio C Hamano
2012-11-26Merge branch 'cn/config-missing-path' into maintJunio C Hamano
2012-11-24Teach rm to remove submodules when given with a trailing '/'Jens Lehmann
2012-11-21Merge branch 'jk/config-ignore-duplicates'Junio C Hamano
2012-11-20Merge branch 'jk/checkout-out-of-unborn'Junio C Hamano
2012-11-20Merge branch 'cn/config-missing-path'Junio C Hamano
2012-11-20Merge branch 'mg/replace-resolve-delete'Junio C Hamano
2012-11-20Merge branch 'kb/preload-index-more'Junio C Hamano
2012-11-19Merge branch 'rs/branch-del-symref' into maintJunio C Hamano
2012-11-19Merge branch 'nd/grep-true-path' into maintJunio C Hamano
2012-11-16config: don't segfault when given --path with a missing valueCarlos Martín Nieto
2012-11-16ident: keep separate "explicit" flags for author and committerJeff King
2012-11-16checkout: print a message when switching unborn branchesJeff King
2012-11-15Merge branch 'jc/prettier-pretty-note'Junio C Hamano