aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jc/hidden-refs'Junio C Hamano2013-02-17
|\
| * upload/receive-pack: allow hiding ref hierarchiesJunio C Hamano2013-02-07
* | Merge branch 'jc/extended-fake-ancestor-for-gitlink'Junio C Hamano2013-02-14
|\ \
| * | apply: verify submodule commit object name betterJunio C Hamano2013-02-05
* | | Merge branch 'maint'Junio C Hamano2013-02-12
|\ \ \
| * | | Replace filepattern with pathspec for consistencyMatthieu Moy2013-02-12
| * | | Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano2013-02-07
| |\ \ \ | | |/ /
| * | | Merge branch 'nd/edit-branch-desc-while-detached' into maintJunio C Hamano2013-02-04
| |\ \ \
| * \ \ \ Merge branch 'jc/help' into maintJunio C Hamano2013-02-04
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/merge-blobs' into maintJunio C Hamano2013-02-04
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/apply-similaritly-parsing'Junio C Hamano2013-02-08
|\ \ \ \ \ \ \
| * | | | | | | builtin/apply: tighten (dis)similarity index parsingJohn Keeping2013-02-03
* | | | | | | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-02-07
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: let branch filters imply --listJeff King2013-01-31
| * | | | | | | | branch: mark more strings for translationNguyễn Thái Ngọc Duy2013-01-30
| * | | | | | | | Merge branch 'nd/edit-branch-desc-while-detached' into HEADJunio C Hamano2013-01-30
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | branch: give a more helpful message on redundant argumentsNguyễn Thái Ngọc Duy2013-01-30
| * | | | | | | | branch: reject -D/-d without branch nameNguyễn Thái Ngọc Duy2013-01-30
* | | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-05
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | apply: diagnose incomplete submodule object name betterJunio C Hamano2013-01-31
| * | | | | | | | apply: simplify build_fake_ancestor()Junio C Hamano2013-01-31
* | | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free'Junio C Hamano2013-02-04
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | logmsg_reencode: lazily load missing commit buffersJeff King2013-01-26
| * | | | | | | | | logmsg_reencode: never return NULLJeff King2013-01-26
| * | | | | | | | | commit: drop useless xstrdup of commit messageJeff King2013-01-26
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mm/add-u-A-sans-pathspec'Junio C Hamano2013-02-04
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: warn when -u or -A is used without pathspecMatthieu Moy2013-01-28
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/push-reject-reasons'Junio C Hamano2013-02-04
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | push: finishing touches to explain REJECT_ALREADY_EXISTS betterJunio C Hamano2013-01-24
| * | | | | | | | | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCEJunio C Hamano2013-01-24
* | | | | | | | | | Merge branch 'jk/config-parsing-cleanup'Junio C Hamano2013-02-04
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reflog: use parse_config_key in config callbackJeff King2013-01-23
| * | | | | | | | | | help: use parse_config_key for man configJeff King2013-01-23
* | | | | | | | | | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-04
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow custom "comment char"Junio C Hamano2013-01-16
* | | | | | | | | | | | Merge branch 'nd/edit-branch-desc-while-detached'Junio C Hamano2013-02-01
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy2013-01-30
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/gc-auto-after-fetch'Junio C Hamano2013-02-01
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetchJunio C Hamano2013-01-26
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | fetch-pack: avoid repeatedly re-scanning pack directoryJeff King2013-01-26
| | * | | | | | | | | | | fetch: run gc --auto after fetchingJeff King2013-01-26
| | |/ / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jc/no-git-config-in-clone'Junio C Hamano2013-02-01
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clone: do not export and unexport GIT_CONFIGJunio C Hamano2013-01-11
* | | | | | | | | | | | | Merge branch 'nd/fetch-depth-is-broken'Junio C Hamano2013-02-01
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fetch: add --unshallow for turning shallow repo into complete oneNguyễn Thái Ngọc Duy2013-01-11
* | | | | | | | | | | | | | Merge branch 'nd/magic-pathspec-from-root'Junio C Hamano2013-01-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | grep: avoid accepting ambiguous revisionNguyễn Thái Ngọc Duy2013-01-21
* | | | | | | | | | | | | | | Merge branch 'jc/help'Junio C Hamano2013-01-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | help: include <common-cmds.h> only in one fileJunio C Hamano2013-01-18
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maintJunio C Hamano2013-01-14
| |\ \ \ \ \ \ \ \ \ \ \ \