summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2011-12-16grep: disable threading in non-worktree caseLibravatar Thomas Rast1-18/+18
2011-12-16grep: enable threading with -p and -W using lazy attribute lookupLibravatar Thomas Rast1-4/+9
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-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-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-21Show error for 'git merge' with unset merge.defaultToUpstreamLibravatar Vincent van Ravesteijn1-3/+6
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-13Convert many resolve_ref() calls to read_ref*() and ref_exists()Libravatar Nguyễn Thái Ngọc Duy7-17/+14
2011-11-12commit-tree: teach -m/-F options to read logs from elsewhereLibravatar Junio C Hamano1-3/+40
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-09commit-tree: update the command line parsingLibravatar Junio C Hamano1-13/+18
2011-11-09commit: teach --amend to carry forward extra headersLibravatar Junio C Hamano1-2/+7
2011-11-09merge: force edit and no-ff mode when merging a tag objectLibravatar Junio C Hamano1-0/+6
2011-11-09commit: copy merged signed tags to headers of merge commitLibravatar Junio C Hamano1-5/+5
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-08merge: record tag objects without peeling in MERGE_HEADLibravatar Junio C Hamano1-3/+10
2011-11-08merge: make usage of commit->util more extensibleLibravatar Junio C Hamano1-40/+23
2011-11-08fmt-merge-msg: Add contents of merged tag in the merge messageLibravatar Junio C Hamano1-2/+70