summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2011-12-16Merge branch 'jc/commit-amend-no-edit'Libravatar Junio C Hamano1-4/+5
2011-12-16Merge branch 'jc/stream-to-pack'Libravatar Junio C Hamano2-44/+23
2011-12-16Merge branch 'jk/upload-archive-use-start-command'Libravatar Junio C Hamano1-31/+12
2011-12-13Merge branch 'ks/tag-cleanup'Libravatar Junio C Hamano1-14/+53
2011-12-13Merge branch 'bc/maint-apply-check-no-patch'Libravatar Junio C Hamano1-5/+5
2011-12-13Merge branch 'nd/ignore-might-be-precious'Libravatar Junio C Hamano2-7/+16
2011-12-13Merge branch 'jn/branch-move-to-self'Libravatar Junio C Hamano2-6/+20
2011-12-13Merge branch 'maint'Libravatar Junio C Hamano2-39/+50
2011-12-13Merge branch 'jc/maint-pack-object-cycle' into maintLibravatar Junio C Hamano1-12/+43
2011-12-13Merge branch 'jc/index-pack-reject-dups' into maintLibravatar Junio C Hamano1-1/+3
2011-12-13Merge branch 'nd/misc-cleanups' into maintLibravatar Junio C Hamano2-6/+7
2011-12-13Merge branch 'maint-1.7.7' into maintLibravatar Junio C Hamano6-45/+53
2011-12-13Merge branch 'ab/clang-lints' into maint-1.7.7Libravatar Junio C Hamano2-4/+1
2011-12-13Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Libravatar Junio C Hamano2-2/+2
2011-12-13Merge branch 'maint-1.7.6' into maint-1.7.7Libravatar Junio C Hamano2-39/+50
2011-12-13Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6Libravatar Junio C Hamano1-38/+49
2011-12-13Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Libravatar Junio C Hamano1-1/+1
2011-12-13blame: don't overflow time bufferLibravatar Jeff King1-1/+1
2011-12-09fetch: create status table using strbufLibravatar Jeff King1-38/+49
2011-12-09Merge branch 'nd/resolve-ref'Libravatar Junio C Hamano11-43/+72
2011-12-09Merge branch 'jc/pull-signed-tag'Libravatar Junio C Hamano7-195/+221
2011-12-09Merge branch 'jc/request-pull-show-head-4'Libravatar Junio C Hamano4-32/+192
2011-12-09git-tag: introduce --cleanup optionLibravatar Kirill A. Shutemov1-14/+53
2011-12-08commit: honour --no-editLibravatar Junio C Hamano1-4/+5
2011-12-05Copy resolve_ref() return value for longer useLibravatar Nguyễn Thái Ngọc Duy7-27/+62
2011-12-05Merge branch 'nd/maint-ignore-exclude'Libravatar Junio C Hamano2-2/+2
2011-12-05Merge branch 'vr/git-merge-default-to-upstream'Libravatar Junio C Hamano1-3/+6
2011-12-05Merge branch 'jc/maint-pack-object-cycle'Libravatar Junio C Hamano1-12/+43
2011-12-05Merge branch 'jc/index-pack-reject-dups'Libravatar Junio C Hamano1-1/+3
2011-12-05Merge branch 'ab/clang-lints'Libravatar Junio C Hamano2-4/+1
2011-12-05Merge branch 'nd/prune-progress'Libravatar Junio C Hamano3-3/+16
2011-12-05Merge branch 'nd/fsck-progress'Libravatar Junio C Hamano1-16/+62
2011-12-05Merge branch 'nd/misc-cleanups'Libravatar Junio C Hamano2-6/+7
2011-12-05Merge branch 'maint-1.7.7' into maintLibravatar Junio C Hamano1-2/+0
2011-12-05Merge branch 'maint-1.7.6' into maint-1.7.7Libravatar Junio C Hamano1-2/+0
2011-12-05stripspace: fix outdated commentLibravatar Jeff King1-2/+0
2011-12-05builtin/apply.c: report error on failure to recognize inputLibravatar Brandon Casey1-5/+5
2011-12-01bulk-checkin: replace fast-import based implementationLibravatar Junio C Hamano2-5/+6
2011-11-28Allow checkout -B <current-branch> to update the current branchLibravatar Jonathan Nieder2-5/+12
2011-11-28branch: allow a no-op "branch -M <current-branch> HEAD"Libravatar Jonathan Nieder1-1/+8
2011-11-28checkout,merge: disallow overwriting ignored files with --no-overwrite-ignoreLibravatar Nguyễn Thái Ngọc Duy2-7/+16
2011-11-28Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-preciousLibravatar Junio C Hamano2-2/+2
2011-11-28checkout,merge: loosen overwriting untracked file check based on info/excludeLibravatar Nguyễn Thái Ngọc Duy2-2/+2
2011-11-23builtin-branch: Fix crash on invalid use of --forceLibravatar Vincent van Ravesteijn1-2/+2
2011-11-23revert --abort: do not leave behind useless sequencer-old directoryLibravatar Jonathan Nieder1-0/+1
2011-11-23Fix revert --abort on WindowsLibravatar Johannes Sixt1-2/+2
2011-11-23revert: do not pass non-literal string as format to git_path()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2011-11-22revert: remove --reset compatibility optionLibravatar Jonathan Nieder1-3/+0
2011-11-22revert: introduce --abort to cancel a failed cherry-pickLibravatar Jonathan Nieder1-3/+84
2011-11-22revert: write REVERT_HEAD pseudoref during conflicted revertLibravatar Jonathan Nieder2-3/+6