aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jk/apply-similaritly-parsing' into maintJunio C Hamano2013-02-25
|\
| * builtin/apply: tighten (dis)similarity index parsingJohn Keeping2013-02-03
* | Merge branch 'zk/clean-report-failure' into maintJunio C Hamano2013-02-25
|\ \
| * | git-clean: Display more accurate delete messagesZoltan Klinger2013-01-14
* | | Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maintJunio C Hamano2013-02-25
|\ \ \
| * | | clone: forbid --bare --separate-git-dir <dir>Nguyễn Thái Ngọc Duy2013-01-10
| | |/ | |/|
* | | Replace filepattern with pathspec for consistencyMatthieu Moy2013-02-12
* | | Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano2013-02-07
|\ \ \
| * | | apply: diagnose incomplete submodule object name betterJunio C Hamano2013-01-31
| * | | apply: simplify build_fake_ancestor()Junio C Hamano2013-01-31
* | | | Merge branch 'nd/edit-branch-desc-while-detached' into maintJunio C Hamano2013-02-04
|\ \ \ \
| * | | | branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy2013-01-30
| | |/ / | |/| |
* | | | Merge branch 'jc/help' into maintJunio C Hamano2013-02-04
|\ \ \ \
| * | | | help: include <common-cmds.h> only in one fileJunio C Hamano2013-01-18
* | | | | Merge branch 'jc/merge-blobs' into maintJunio C Hamano2013-02-04
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | merge-tree: fix d/f conflictsJunio C Hamano2012-12-26
| * | | | merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-26
| * | | | merge-tree: lose unused "resolve_directories"Junio C Hamano2012-12-26
| * | | | merge-tree: lose unused "flags" from merge_listJunio C Hamano2012-12-26
| * | | | Which merge_file() function do you mean?Junio C Hamano2012-12-09
* | | | | Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maintJunio C Hamano2013-01-14
|\ \ \ \ \
| * | | | | clone: support atomic operation with --separate-git-dirJens Lehmann2013-01-05
* | | | | | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintJunio C Hamano2013-01-14
|\ \ \ \ \ \
| * | | | | | merge --no-edit: do not credit people involved in the side branchJunio C Hamano2012-12-28
* | | | | | | Merge branch 'jc/apply-trailing-blank-removal' into maintJunio C Hamano2013-01-14
|\ \ \ \ \ \ \
| * | | | | | | apply.c:update_pre_post_images(): the preimage can be truncatedJunio C Hamano2012-10-12
| |/ / / / / /
* | | | | | | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maintJunio C Hamano2013-01-11
|\ \ \ \ \ \ \
| * | | | | | | merge: Honor prepare-commit-msg return codeAntoine Pelisse2013-01-03
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'sp/shortlog-missing-lf' into maintJunio C Hamano2013-01-10
|\ \ \ \ \ \ \
| * | | | | | | shortlog: fix wrapping lines of wraplenSteffen Prohaska2012-12-11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'maint'Junio C Hamano2012-12-13
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | Fix sizeof usage in get_permutationsMatthew Daley2012-12-13
| * | | | | Merge branch 'jc/same-encoding' into maintJunio C Hamano2012-12-07
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/send-email-sender-prompt'Junio C Hamano2012-11-29
|\ \ \ \ \ \ \
| * | | | | | | ident: keep separate "explicit" flags for author and committerJeff King2012-11-15
* | | | | | | | Merge branch 'jl/submodule-rm'Junio C Hamano2012-11-29
|\ \ \ \ \ \ \ \
| * | | | | | | | Teach rm to remove submodules when given with a trailing '/'Jens Lehmann2012-11-23
* | | | | | | | | Merge branch 'maint'Junio C Hamano2012-11-26
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Fix typo in remote set-head usageAntoine Pelisse2012-11-26
| * | | | | | | | Merge branch 'jk/checkout-out-of-unborn' into maintJunio C Hamano2012-11-25
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'cn/config-missing-path' into maintJunio C Hamano2012-11-25
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/branch-del-symref' into maintJunio C Hamano2012-11-18
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/grep-true-path' into maintJunio C Hamano2012-11-18
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-ignore-duplicates'Junio C Hamano2012-11-21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | builtin/config.c: Fix a sparse warningRamsay Jones2012-10-29
| * | | | | | | | | | | | | git-config: use git_config_with_optionsJeff King2012-10-24
| * | | | | | | | | | | | | git-config: do not complain about duplicate entriesJeff King2012-10-24
| * | | | | | | | | | | | | git-config: collect values instead of immediately printingJeff King2012-10-24
| * | | | | | | | | | | | | git-config: fix regexp memory leaks on error conditionsJeff King2012-10-24
| * | | | | | | | | | | | | git-config: remove memory leak of key regexpJeff King2012-10-24
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |