summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2013-02-25Merge branch 'jk/apply-similaritly-parsing' into maintLibravatar Junio C Hamano1-4/+6
2013-02-25Merge branch 'zk/clean-report-failure' into maintLibravatar Junio C Hamano1-29/+125
2013-02-25Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maintLibravatar Junio C Hamano1-0/+2
2013-02-12Replace filepattern with pathspec for consistencyLibravatar Matthieu Moy2-3/+3
2013-02-07Merge branch 'jc/fake-ancestor-with-non-blobs' into maintLibravatar Junio C Hamano1-14/+16
2013-02-04Merge branch 'nd/edit-branch-desc-while-detached' into maintLibravatar Junio C Hamano1-4/+4
2013-02-04Merge branch 'jc/help' into maintLibravatar Junio C Hamano1-18/+0
2013-02-04Merge branch 'jc/merge-blobs' into maintLibravatar Junio C Hamano2-37/+59
2013-02-03builtin/apply: tighten (dis)similarity index parsingLibravatar John Keeping1-4/+6
2013-01-31apply: diagnose incomplete submodule object name betterLibravatar Junio C Hamano1-1/+5
2013-01-31apply: simplify build_fake_ancestor()Libravatar Junio C Hamano1-14/+12
2013-01-30branch: no detached HEAD check when editing another branch's descriptionLibravatar Nguyễn Thái Ngọc Duy1-4/+4
2013-01-18help: include <common-cmds.h> only in one fileLibravatar Junio C Hamano1-18/+0
2013-01-14git-clean: Display more accurate delete messagesLibravatar Zoltan Klinger1-29/+125
2013-01-14Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maintLibravatar Junio C Hamano1-1/+3
2013-01-14Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintLibravatar Junio C Hamano2-7/+15
2013-01-14Merge branch 'jc/apply-trailing-blank-removal' into maintLibravatar Junio C Hamano1-6/+17
2013-01-11Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maintLibravatar Junio C Hamano1-2/+3
2013-01-10clone: forbid --bare --separate-git-dir <dir>Libravatar Nguyễn Thái Ngọc Duy1-0/+2
2013-01-10Merge branch 'sp/shortlog-missing-lf' into maintLibravatar Junio C Hamano1-3/+2
2013-01-05clone: support atomic operation with --separate-git-dirLibravatar Jens Lehmann1-1/+3
2013-01-03merge: Honor prepare-commit-msg return codeLibravatar Antoine Pelisse1-2/+3
2012-12-28merge --no-edit: do not credit people involved in the side branchLibravatar Junio C Hamano2-7/+15
2012-12-26merge-tree: fix d/f conflictsLibravatar Junio C Hamano1-32/+40
2012-12-26merge-tree: add comments to clarify what these functions are doingLibravatar Junio C Hamano1-4/+22
2012-12-26merge-tree: lose unused "resolve_directories"Libravatar Junio C Hamano1-3/+0
2012-12-26merge-tree: lose unused "flags" from merge_listLibravatar Junio C Hamano1-2/+1
2012-12-13Merge branch 'maint'Libravatar Junio C Hamano1-3/+3
2012-12-13Fix sizeof usage in get_permutationsLibravatar Matthew Daley1-3/+3
2012-12-11shortlog: fix wrapping lines of wraplenLibravatar Steffen Prohaska1-3/+2
2012-12-09Which merge_file() function do you mean?Libravatar Junio C Hamano2-4/+4
2012-12-07Merge branch 'jc/same-encoding' into maintLibravatar Junio C Hamano1-1/+2
2012-11-29Merge branch 'jk/send-email-sender-prompt'Libravatar Junio C Hamano1-2/+2
2012-11-29Merge branch 'jl/submodule-rm'Libravatar Junio C Hamano1-0/+15
2012-11-26Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2012-11-26Fix typo in remote set-head usageLibravatar Antoine Pelisse1-1/+1
2012-11-25Merge branch 'jk/checkout-out-of-unborn' into maintLibravatar Junio C Hamano1-0/+3
2012-11-25Merge branch 'cn/config-missing-path' into maintLibravatar Junio C Hamano1-1/+2
2012-11-23Teach rm to remove submodules when given with a trailing '/'Libravatar Jens Lehmann1-0/+15
2012-11-21Merge branch 'jk/config-ignore-duplicates'Libravatar Junio C Hamano1-65/+43
2012-11-20Merge branch 'jk/checkout-out-of-unborn'Libravatar Junio C Hamano1-0/+3
2012-11-20Merge branch 'cn/config-missing-path'Libravatar Junio C Hamano1-1/+2
2012-11-20Merge branch 'mg/replace-resolve-delete'Libravatar Junio C Hamano1-6/+9
2012-11-20Merge branch 'kb/preload-index-more'Libravatar Junio C Hamano3-6/+15
2012-11-18Merge branch 'rs/branch-del-symref' into maintLibravatar Junio C Hamano1-26/+49
2012-11-18Merge branch 'nd/grep-true-path' into maintLibravatar Junio C Hamano1-13/+18
2012-11-15config: don't segfault when given --path with a missing valueLibravatar Carlos Martín Nieto1-1/+2
2012-11-15ident: keep separate "explicit" flags for author and committerLibravatar Jeff King1-2/+2
2012-11-15checkout: print a message when switching unborn branchesLibravatar Jeff King1-0/+3
2012-11-15Merge branch 'jc/prettier-pretty-note'Libravatar Junio C Hamano1-2/+3