summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1Junio C Hamano2013-04-032-6/+2
|\
| * use parse_object_or_die instead of die("bad object")Jeff King2013-03-172-6/+2
* | Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1Junio C Hamano2013-04-031-1/+1
|\ \
| * | update-index: allow "-h" to also display optionsAntoine Pelisse2013-02-231-1/+1
* | | Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1Junio C Hamano2013-04-031-4/+5
|\ \ \
| * | | index-pack: fix buffer overflow caused by translationsNguyễn Thái Ngọc Duy2013-03-161-4/+5
* | | | merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping2013-03-271-1/+1
* | | | Merge branch 'jk/apply-similaritly-parsing' into maintJunio C Hamano2013-02-251-4/+6
|\ \ \ \
| * | | | builtin/apply: tighten (dis)similarity index parsingJohn Keeping2013-02-031-4/+6
| | |_|/ | |/| |
* | | | Merge branch 'zk/clean-report-failure' into maintJunio C Hamano2013-02-251-29/+125
|\ \ \ \
| * | | | git-clean: Display more accurate delete messagesZoltan Klinger2013-01-141-29/+125
* | | | | Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maintJunio C Hamano2013-02-251-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | clone: forbid --bare --separate-git-dir <dir>Nguyễn Thái Ngọc Duy2013-01-101-0/+2
| | |/ / | |/| |
* | | | Replace filepattern with pathspec for consistencyMatthieu Moy2013-02-122-3/+3
* | | | Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano2013-02-071-14/+16
|\ \ \ \
| * | | | apply: diagnose incomplete submodule object name betterJunio C Hamano2013-01-311-1/+5
| * | | | apply: simplify build_fake_ancestor()Junio C Hamano2013-01-311-14/+12
* | | | | Merge branch 'nd/edit-branch-desc-while-detached' into maintJunio C Hamano2013-02-041-4/+4
|\ \ \ \ \
| * | | | | branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy2013-01-301-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'jc/help' into maintJunio C Hamano2013-02-041-18/+0
|\ \ \ \ \
| * | | | | help: include <common-cmds.h> only in one fileJunio C Hamano2013-01-181-18/+0
* | | | | | Merge branch 'jc/merge-blobs' into maintJunio C Hamano2013-02-042-37/+59
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | merge-tree: fix d/f conflictsJunio C Hamano2012-12-261-32/+40
| * | | | | merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-261-4/+22
| * | | | | merge-tree: lose unused "resolve_directories"Junio C Hamano2012-12-261-3/+0
| * | | | | merge-tree: lose unused "flags" from merge_listJunio C Hamano2012-12-261-2/+1
| * | | | | Which merge_file() function do you mean?Junio C Hamano2012-12-092-4/+4
* | | | | | Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maintJunio C Hamano2013-01-141-1/+3
|\ \ \ \ \ \
| * | | | | | clone: support atomic operation with --separate-git-dirJens Lehmann2013-01-051-1/+3
* | | | | | | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintJunio C Hamano2013-01-142-7/+15
|\ \ \ \ \ \ \
| * | | | | | | merge --no-edit: do not credit people involved in the side branchJunio C Hamano2012-12-282-7/+15
* | | | | | | | Merge branch 'jc/apply-trailing-blank-removal' into maintJunio C Hamano2013-01-141-6/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | apply.c:update_pre_post_images(): the preimage can be truncatedJunio C Hamano2012-10-121-6/+17
| |/ / / / / / /
* | | | | | | | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maintJunio C Hamano2013-01-111-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: Honor prepare-commit-msg return codeAntoine Pelisse2013-01-031-2/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'sp/shortlog-missing-lf' into maintJunio C Hamano2013-01-101-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | shortlog: fix wrapping lines of wraplenSteffen Prohaska2012-12-111-3/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'maint'Junio C Hamano2012-12-131-3/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix sizeof usage in get_permutationsMatthew Daley2012-12-131-3/+3
| * | | | | | Merge branch 'jc/same-encoding' into maintJunio C Hamano2012-12-071-1/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jk/send-email-sender-prompt'Junio C Hamano2012-11-291-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | ident: keep separate "explicit" flags for author and committerJeff King2012-11-151-2/+2
* | | | | | | | | Merge branch 'jl/submodule-rm'Junio C Hamano2012-11-291-0/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Teach rm to remove submodules when given with a trailing '/'Jens Lehmann2012-11-231-0/+15
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-11-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix typo in remote set-head usageAntoine Pelisse2012-11-261-1/+1
| * | | | | | | | | Merge branch 'jk/checkout-out-of-unborn' into maintJunio C Hamano2012-11-251-0/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cn/config-missing-path' into maintJunio C Hamano2012-11-251-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/branch-del-symref' into maintJunio C Hamano2012-11-181-26/+49
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/grep-true-path' into maintJunio C Hamano2012-11-181-13/+18
| |\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status