summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/fetch-no-tail-match-refs'Junio C Hamano2011-12-192-7/+11
|\
| * fetch-pack: match refs exactlyJeff King2011-12-131-4/+9
| * drop "match" parameter from get_remote_headsJeff King2011-12-132-3/+2
* | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-1914-50/+41
|\ \
| * | Rename resolve_ref() to resolve_ref_unsafe()nd/resolve-refNguyễn Thái Ngọc Duy2011-12-138-9/+9
| * | Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-138-40/+31
| * | revert: convert resolve_ref() to read_ref_full()Nguyễn Thái Ngọc Duy2011-12-121-1/+1
* | | Merge branch 'jn/maint-sequencer-fixes'Junio C Hamano2011-12-191-48/+92
|\ \ \
| * | | revert: stop creating and removing sequencer-old directoryjn/maint-sequencer-fixesJonathan Nieder2011-12-121-3/+3
| * | | revert: do not remove state until sequence is finishedJonathan Nieder2011-12-121-11/+1
| * | | revert: allow single-pick in the middle of cherry-pick sequenceJonathan Nieder2011-12-121-0/+26
| * | | revert: pass around rev-list args in already-parsed formJonathan Nieder2011-12-121-24/+29
| * | | revert: allow cherry-pick --continue to commit before resumingJonathan Nieder2011-12-121-3/+20
| * | | revert: give --continue handling its own functionJonathan Nieder2011-12-121-11/+17
* | | | Merge branch 'jk/maint-mv'Junio C Hamano2011-12-191-2/+4
|\ \ \ \
| * | | | mv: be quiet about overwritingjk/maint-mvJeff King2011-12-121-1/+2
| * | | | mv: improve overwrite warningJeff King2011-12-121-1/+1
| * | | | mv: make non-directory destination error more clearJeff King2011-12-121-1/+1
| * | | | mv: honor --verbose flagJeff King2011-12-121-0/+1
* | | | | Merge branch 'ci/stripspace-docs'Junio C Hamano2011-12-191-1/+1
|\ \ \ \ \
| * | | | | Update documentation for stripspaceci/stripspace-docsConrad Irwin2011-12-121-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'tr/cache-tree'Junio C Hamano2011-12-192-4/+10
|\ \ \ \ \
| * | | | | reset: update cache-tree data when appropriateThomas Rast2011-12-061-0/+7
| * | | | | commit: write cache-tree data when writing index anywayThomas Rast2011-12-061-0/+2
| * | | | | Refactor cache_tree_update idiom from commitThomas Rast2011-12-061-4/+1
* | | | | | Merge branch 'jc/commit-amend-no-edit'Junio C Hamano2011-12-161-4/+5
|\ \ \ \ \ \
| * | | | | | commit: honour --no-editJunio C Hamano2011-12-081-4/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/stream-to-pack'Junio C Hamano2011-12-162-44/+23
|\ \ \ \ \ \
| * | | | | | bulk-checkin: replace fast-import based implementationjc/stream-to-packJunio C Hamano2011-12-012-5/+6
| * | | | | | finish_tmp_packfile(): a helper functionJunio C Hamano2011-10-281-23/+10
| * | | | | | create_tmp_packfile(): a helper functionJunio C Hamano2011-10-281-9/+3
| * | | | | | write_pack_header(): a helper functionJunio C Hamano2011-10-281-6/+3
* | | | | | | Merge branch 'jk/upload-archive-use-start-command'Junio C Hamano2011-12-161-31/+12
|\ \ \ \ \ \ \
| * | | | | | | upload-archive: use start_command instead of forkjk/upload-archive-use-start-commandJeff King2011-11-211-31/+12
* | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status