summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* status: respect "-b" for porcelain formatJeff King2012-05-081-5/+4
* status: refactor null_termination optionJeff King2012-05-081-9/+8
* commit: refactor option parsingJeff King2012-05-081-58/+59
* Merge branch 'jc/merge-reduce-parents-early' into maintJunio C Hamano2012-05-032-63/+207
|\
| * fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-181-9/+119
| * builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-171-25/+40
| * builtin/merge.c: collect other parents earlyJunio C Hamano2012-04-171-13/+27
| * builtin/merge.c: remove "remoteheads" global variableJunio C Hamano2012-04-171-23/+28
* | Merge branch 'cb/cherry-pick-rev-path-confusion' into maintJunio C Hamano2012-05-031-1/+4
|\ \
| * | cherry-pick: do not expect file argumentsClemens Buchacher2012-04-151-1/+4
* | | Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintJunio C Hamano2012-05-031-4/+13
|\ \ \
| * | | fetch: describe new refs based on where it came fromMarc Branchaud2012-04-171-3/+11
| * | | fetch: Give remote_ref to update_local_ref() as wellMarc Branchaud2012-04-171-1/+2
| | |/ | |/|
* | | Merge branch 'it/fetch-pack-many-refs' into maintJunio C Hamano2012-05-011-1/+41
|\ \ \
| * | | fetch-pack: new --stdin option to read refs from stdinIvan Todoroski2012-04-021-1/+41
* | | | Merge branch 'jl/maint-submodule-recurse-fetch' into maintJunio C Hamano2012-05-011-3/+3
|\ \ \ \
| * | | | submodules: recursive fetch also checks new tags for submodule commitsJens Lehmann2012-04-141-3/+3
| | |/ / | |/| |
* | | | Merge branch 'jc/maint-blame-minimal' into maintJunio C Hamano2012-05-011-0/+1
|\ \ \ \
| * | | | blame: accept --need-minimalJunio C Hamano2012-04-111-0/+1
| * | | | Merge branch 'tr/cache-tree' into maint-1.7.8Junio C Hamano2012-04-092-4/+10
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2012-04-261-8/+18
|\ \ \ \ \ \
| * | | | | | push: error out when the "upstream" semantics does not make senseJunio C Hamano2012-04-051-8/+18
* | | | | | | Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-231-1/+1
* | | | | | | | Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-261-19/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: rephrase the error when user did not touch templated log messageJunio C Hamano2012-03-301-19/+41
| * | | | | | | | commit: do not trigger bogus "has templated message edited" checkJunio C Hamano2012-03-301-0/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-261-3/+19
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | commit: pass author/committer info to hooksjc/commit-hook-authorshipJunio C Hamano2012-03-111-3/+19
* | | | | | | | Sync with 1.7.9.6Junio C Hamano2012-04-021-4/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'jc/maint-merge-autoedit' into maintJunio C Hamano2012-04-021-1/+28
| |\ \ \ \ \ \ \
| | * | | | | | | merge: backport GIT_MERGE_AUTOEDIT supportjc/maint-merge-autoeditJunio C Hamano2012-03-201-1/+28
| | |/ / / / / /
| * | | | | | | Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-201-5/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'jc/advise-i18n' into maint-1.7.8Junio C Hamano2012-03-201-5/+4
| | |\ \ \ \ \
* | | | | | | | config: remove useless assignmentRené Scharfe2012-03-281-2/+0
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'az/verify-tag-use-gpg-config'Junio C Hamano2012-03-121-1/+9
|\ \ \ \ \ \ \
| * | | | | | | verify-tag: Parse GPG configuration options.az/verify-tag-use-gpg-configAlex Zepeda2012-03-081-1/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'kb/maint-prune-rmdir-closedir'Junio C Hamano2012-03-082-3/+3
|\ \ \ \ \ \ \
| * | | | | | | fix deletion of .git/objects sub-directories in git-prune/repackkb/maint-prune-rmdir-closedirKarsten Blees2012-03-072-3/+3
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2012-03-041-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/maint-verify-objects' into maintJunio C Hamano2012-03-041-22/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pj/remote-set-branches-usage-fix' into maintJunio C Hamano2012-02-271-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano2012-02-271-0/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cb/receive-pack-keep-errors' into maintJunio C Hamano2012-02-211-7/+17
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/transfer-no-progress' into maintJunio C Hamano2012-02-215-16/+18
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/git-dir-lookup' into maintJunio C Hamano2012-02-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-rev-list-verify-object' into maintJunio C Hamano2012-02-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-binary-attribute' into maintJunio C Hamano2012-02-211-144/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diffstat-gramnum' into maintJunio C Hamano2012-02-211-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-out-of-unborn' into maintJunio C Hamano2012-02-161-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status