summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ks/tag-cleanup'Junio C Hamano2011-12-131-14/+53
|\
| * git-tag: introduce --cleanup optionks/tag-cleanupKirill A. Shutemov2011-12-091-14/+53
* | Merge branch 'bc/maint-apply-check-no-patch'Junio C Hamano2011-12-131-5/+5
|\ \
| * | builtin/apply.c: report error on failure to recognize inputbc/maint-apply-check-no-patchBrandon Casey2011-12-051-5/+5
* | | Merge branch 'nd/ignore-might-be-precious'Junio C Hamano2011-12-132-7/+16
|\ \ \
| * | | checkout,merge: disallow overwriting ignored files with --no-overwrite-ignorend/ignore-might-be-preciousNguyễn Thái Ngọc Duy2011-11-282-7/+16
| * | | Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-preciousJunio C Hamano2011-11-282-2/+2
| |\ \ \
* | \ \ \ Merge branch 'jn/branch-move-to-self'Junio C Hamano2011-12-132-6/+20
|\ \ \ \ \
| * | | | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-selfJonathan Nieder2011-11-282-5/+12
| * | | | | branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder2011-11-281-1/+8
| |/ / / /
* | | | | Merge branch 'maint'Junio C Hamano2011-12-132-39/+50
|\ \ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-pack-object-cycle' into maintJunio C Hamano2011-12-131-12/+43
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/index-pack-reject-dups' into maintJunio C Hamano2011-12-131-1/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/misc-cleanups' into maintJunio C Hamano2011-12-132-6/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-136-45/+53
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano2011-12-132-4/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano2011-12-132-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-132-39/+50
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6Junio C Hamano2011-12-131-38/+49
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | fetch: create status table using strbufjk/maint-fetch-status-tableJeff King2011-12-091-38/+49
| | | * | | | | | | | | | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Junio C Hamano2011-12-131-1/+1
| | | * | | | | | | | | | blame: don't overflow time bufferJeff King2011-12-131-1/+1
* | | | | | | | | | | | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-0911-43/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy2011-12-057-27/+62
| * | | | | | | | | | | | | Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy2011-11-137-17/+14
* | | | | | | | | | | | | | Merge branch 'jc/pull-signed-tag'Junio C Hamano2011-12-097-195/+221
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | commit-tree: teach -m/-F options to read logs from elsewhereJunio C Hamano2011-11-121-3/+40
| * | | | | | | | | | | | | | commit-tree: update the command line parsingJunio C Hamano2011-11-091-13/+18
| * | | | | | | | | | | | | | commit: teach --amend to carry forward extra headersJunio C Hamano2011-11-091-2/+7
| * | | | | | | | | | | | | | merge: force edit and no-ff mode when merging a tag objectJunio C Hamano2011-11-091-0/+6
| * | | | | | | | | | | | | | commit: copy merged signed tags to headers of merge commitJunio C Hamano2011-11-091-5/+5
| * | | | | | | | | | | | | | merge: record tag objects without peeling in MERGE_HEADJunio C Hamano2011-11-081-3/+10
| * | | | | | | | | | | | | | merge: make usage of commit->util more extensibleJunio C Hamano2011-11-081-40/+23
| * | | | | | | | | | | | | | fmt-merge-msg: Add contents of merged tag in the merge messageJunio C Hamano2011-11-081-2/+70
| * | | | | | | | | | | | | | fmt-merge-msg: package options into a structureJunio C Hamano2011-11-072-17/+20
| * | | | | | | | | | | | | | fmt-merge-msg: avoid early returnsJunio C Hamano2011-11-071-10/+10
| * | | | | | | | | | | | | | merge: notice local merging of tags and keep it unwrappedJunio C Hamano2011-11-071-0/+5
| * | | | | | | | | | | | | | fetch: do not store peeled tag object names in FETCH_HEADLinus Torvalds2011-11-041-2/+1
| * | | | | | | | | | | | | | Split GPG interface into its own helper libraryJunio C Hamano2011-11-042-100/+11
* | | | | | | | | | | | | | | Merge branch 'jc/request-pull-show-head-4'Junio C Hamano2011-12-094-32/+192
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse errorRamsay Jones2011-10-151-1/+1
| * | | | | | | | | | | | | | builtin/log.c: Fix an "Using plain integer as NULL pointer" warningRamsay Jones2011-10-091-1/+1
| * | | | | | | | | | | | | | fmt-merge-msg: use branch.$name.descriptionJunio C Hamano2011-10-072-26/+69
| * | | | | | | | | | | | | | branch: teach --edit-description optionJunio C Hamano2011-10-051-2/+54
| * | | | | | | | | | | | | | format-patch: use branch description in cover letterJunio C Hamano2011-10-051-3/+68
* | | | | | | | | | | | | | | Merge branch 'nd/maint-ignore-exclude'Junio C Hamano2011-12-052-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-excludeNguyễn Thái Ngọc Duy2011-11-282-2/+2
* | | | | | | | | | | | | | | Merge branch 'vr/git-merge-default-to-upstream'Junio C Hamano2011-12-051-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Show error for 'git merge' with unset merge.defaultToUpstreamvr/git-merge-default-to-upstreamVincent van Ravesteijn2011-11-211-3/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jc/maint-pack-object-cycle'Junio C Hamano2011-12-051-12/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
View Lorry Controller Status