aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jc/merge-reduce-parents-early' into maintJunio C Hamano2012-05-03
|\
| * fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-18
| * builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-17
| * builtin/merge.c: collect other parents earlyJunio C Hamano2012-04-17
| * builtin/merge.c: remove "remoteheads" global variableJunio C Hamano2012-04-17
* | Merge branch 'cb/cherry-pick-rev-path-confusion' into maintJunio C Hamano2012-05-03
|\ \
| * | cherry-pick: do not expect file argumentsClemens Buchacher2012-04-15
* | | Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintJunio C Hamano2012-05-03
|\ \ \
| * | | fetch: describe new refs based on where it came fromMarc Branchaud2012-04-17
| * | | fetch: Give remote_ref to update_local_ref() as wellMarc Branchaud2012-04-17
| | |/ | |/|
* | | Merge branch 'it/fetch-pack-many-refs' into maintJunio C Hamano2012-05-01
|\ \ \
| * | | fetch-pack: new --stdin option to read refs from stdinIvan Todoroski2012-04-02
* | | | Merge branch 'jl/maint-submodule-recurse-fetch' into maintJunio C Hamano2012-05-01
|\ \ \ \
| * | | | submodules: recursive fetch also checks new tags for submodule commitsJens Lehmann2012-04-14
| | |/ / | |/| |
* | | | Merge branch 'jc/maint-blame-minimal' into maintJunio C Hamano2012-05-01
|\ \ \ \
| * | | | blame: accept --need-minimalJunio C Hamano2012-04-11
| * | | | Merge branch 'tr/cache-tree' into maint-1.7.8Junio C Hamano2012-04-09
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2012-04-26
|\ \ \ \ \ \
| * | | | | | push: error out when the "upstream" semantics does not make senseJunio C Hamano2012-04-05
* | | | | | | Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-26
|\ \ \ \ \ \ \
| * | | | | | | drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-23
* | | | | | | | Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-26
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: rephrase the error when user did not touch templated log messageJunio C Hamano2012-03-30
| * | | | | | | | commit: do not trigger bogus "has templated message edited" checkJunio C Hamano2012-03-30
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-26
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | commit: pass author/committer info to hooksJunio C Hamano2012-03-11
* | | | | | | | Sync with 1.7.9.6Junio C Hamano2012-04-02
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'jc/maint-merge-autoedit' into maintJunio C Hamano2012-04-02
| |\ \ \ \ \ \ \
| | * | | | | | | merge: backport GIT_MERGE_AUTOEDIT supportJunio C Hamano2012-03-20
| | |/ / / / / /
| * | | | | | | Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-20
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'jc/advise-i18n' into maint-1.7.8Junio C Hamano2012-03-20
| | |\ \ \ \ \
* | | | | | | | config: remove useless assignmentRené Scharfe2012-03-28
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'az/verify-tag-use-gpg-config'Junio C Hamano2012-03-12
|\ \ \ \ \ \ \
| * | | | | | | verify-tag: Parse GPG configuration options.Alex Zepeda2012-03-08
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'kb/maint-prune-rmdir-closedir'Junio C Hamano2012-03-08
|\ \ \ \ \ \ \
| * | | | | | | fix deletion of .git/objects sub-directories in git-prune/repackKarsten Blees2012-03-07
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2012-03-04
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/maint-verify-objects' into maintJunio C Hamano2012-03-04
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pj/remote-set-branches-usage-fix' into maintJunio C Hamano2012-02-27
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano2012-02-27
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cb/receive-pack-keep-errors' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/transfer-no-progress' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/git-dir-lookup' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-rev-list-verify-object' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-binary-attribute' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diffstat-gramnum' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-out-of-unborn' into maintJunio C Hamano2012-02-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jx/i18n-more-marking' into maintJunio C Hamano2012-02-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-tag-show-fixes' into maintJunio C Hamano2012-02-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/merge-no-edit-fix' into maintJunio C Hamano2012-02-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-18 22:00:38 +0000