summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
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
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-21upload-archive: use start_command instead of forkLibravatar Jeff King1-31/+12
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: teach --gpg-sign optionLibravatar Junio C Hamano3-6/+46
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
2011-11-07prune: handle --progress/no-progressLibravatar Jeff King2-3/+12
2011-11-07prune: show progress while marking reachable objectsLibravatar Nguyễn Thái Ngọc Duy2-2/+6
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-07fmt-merge-msg: package options into a structureLibravatar Junio C Hamano2-17/+20
2011-11-07fmt-merge-msg: avoid early returnsLibravatar Junio C Hamano1-10/+10
2011-11-07merge: notice local merging of tags and keep it unwrappedLibravatar Junio C Hamano1-0/+5
2011-11-06remote: fix set-branches usageLibravatar Junio C Hamano1-1/+1
2011-11-06fsck: print progressLibravatar Nguyễn Thái Ngọc Duy1-2/+38
2011-11-06fsck: avoid reading every object twiceLibravatar Nguyễn Thái Ngọc Duy1-17/+25