summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2011-12-28Merge branch 'jn/branch-move-to-self' into maintLibravatar Junio C Hamano2-6/+20
2011-12-21Merge branch 'bc/maint-apply-check-no-patch' into maintLibravatar Junio C Hamano1-5/+5
2011-12-21clone: the -o option has nothing to do with <branch>Libravatar Carlos Martín Nieto1-2/+2
2011-12-21builtin/log: remove redundant initializationLibravatar Michael Schubert1-2/+0
2011-12-21Merge branch 'ms/commit-cc-option-helpstring' into maintLibravatar Junio C Hamano1-1/+1
2011-12-20builtin/init-db.c: eliminate -Wformat warning on SolarisLibravatar Ævar Arnfjörð Bjarmason1-1/+1
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-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-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: 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
2011-11-22revert: improve error message for cherry-pick during cherry-pickLibravatar Jonathan Nieder1-7/+6
2011-11-22revert: rearrange pick_revisions() for clarityLibravatar Jonathan Nieder1-24/+24
2011-11-22revert: rename --reset option to --quitLibravatar Jonathan Nieder1-11/+14
2011-11-18Sync with 1.7.7.4Libravatar Junio C Hamano1-1/+1
2011-11-18Merge branch 'jc/maint-name-rev-all' into maintLibravatar Junio C Hamano1-1/+1
2011-11-17do not let git_path clobber errno when reporting errorsLibravatar Jonathan Nieder2-24/+34
2011-11-16pack-object: tolerate broken packs that have duplicated objectsLibravatar Junio C Hamano1-12/+43
2011-11-16receive-pack, fetch-pack: reject bogus pack that records objects twiceLibravatar Junio C Hamano1-1/+3
2011-11-15revert: prettify fatal messagesLibravatar Ramkumar Ramachandra1-5/+5
2011-11-15Revert "upload-archive: use start_command instead of fork"Libravatar Junio C Hamano2-26/+48
2011-11-11Merge branch 'ly/mktree-using-strbuf'Libravatar Junio C Hamano1-0/+1
2011-11-10Merge "Move 'builtin-*' into a 'builtin/' subdirectory"Libravatar Junio C Hamano89-0/+42161
2011-11-08Merge branch 'jc/remote-setbranches-usage-fix'Libravatar Junio C Hamano1-1/+1
2011-11-08Merge branch 'fc/remote-seturl-usage-fix'Libravatar Junio C Hamano1-1/+1
2011-11-08Merge branch 'dm/pack-objects-update' into maintLibravatar Junio C Hamano1-19/+55
2011-11-07Merge branch 'ss/blame-textconv-fake-working-tree'Libravatar Junio C Hamano1-4/+3
2011-11-07blame.c: Properly initialize strbuf after calling textconv_object(), againLibravatar Sebastian Schuberth1-4/+3
2011-11-06remote: fix set-branches usageLibravatar Junio C Hamano1-1/+1
2011-11-06cast variable in call to free() in builtin/diff.c and submodule.cLibravatar Ævar Arnfjörð Bjarmason1-1/+1