summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-pack-object-cycle' into maintJunio C Hamano2011-12-131-12/+43
|\
| * pack-object: tolerate broken packs that have duplicated objectsjc/maint-pack-object-cycleJunio C Hamano2011-11-161-12/+43
* | Merge branch 'jc/index-pack-reject-dups' into maintJunio C Hamano2011-12-131-1/+3
|\ \
| * | receive-pack, fetch-pack: reject bogus pack that records objects twicejc/index-pack-reject-dupsJunio C Hamano2011-11-161-1/+3
* | | Merge branch 'nd/misc-cleanups' into maintJunio C Hamano2011-12-132-6/+7
|\ \ \
| * | | tree_entry_interesting(): give meaningful names to return valuesNguyễn Thái Ngọc Duy2011-10-271-4/+5
| * | | tree-walk.c: do not leak internal structure in tree_entry_len()Nguyễn Thái Ngọc Duy2011-10-272-2/+2
* | | | 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
| |\ \ \ \
| | * | | | cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lintsÆvar Arnfjörð Bjarmason2011-11-061-1/+1
| | * | | | apply: get rid of useless x < 0 comparison on a size_t typeÆvar Arnfjörð Bjarmason2011-11-061-3/+0
| * | | | | Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano2011-12-132-2/+2
| |\ \ \ \ \
| | * | | | | checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-excludeNguyễn Thái Ngọc Duy2011-11-282-2/+2
| * | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-132-39/+50
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6Junio C Hamano2011-12-131-38/+49
| | |\ \ \ \ \ \
| | | * | | | | | fetch: create status table using strbufjk/maint-fetch-status-tableJeff King2011-12-091-38/+49
| | * | | | | | | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Junio C Hamano2011-12-131-1/+1
| | * | | | | | | blame: don't overflow time bufferJeff King2011-12-131-1/+1
* | | | | | | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-051-2/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-051-2/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | stripspace: fix outdated commentJeff King2011-12-051-2/+0
* | | | | | | | | builtin-branch: Fix crash on invalid use of --forceVincent van Ravesteijn2011-11-231-2/+2
* | | | | | | | | revert --abort: do not leave behind useless sequencer-old directoryJonathan Nieder2011-11-231-0/+1
* | | | | | | | | Fix revert --abort on WindowsJohannes Sixt2011-11-231-2/+2
* | | | | | | | | revert: do not pass non-literal string as format to git_path()Nguyễn Thái Ngọc Duy2011-11-231-1/+1
* | | | | | | | | revert: remove --reset compatibility optionjn/revert-quitJonathan Nieder2011-11-221-3/+0
* | | | | | | | | revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder2011-11-221-3/+84
* | | | | | | | | revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-222-3/+6
* | | | | | | | | revert: improve error message for cherry-pick during cherry-pickJonathan Nieder2011-11-221-7/+6
* | | | | | | | | revert: rearrange pick_revisions() for clarityJonathan Nieder2011-11-221-24/+24
* | | | | | | | | revert: rename --reset option to --quitJonathan Nieder2011-11-221-11/+14
* | | | | | | | | Sync with 1.7.7.4Junio C Hamano2011-11-181-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'jc/maint-name-rev-all' into maintJunio C Hamano2011-11-181-1/+1
| * | | | | | | | Merge branch 'dm/pack-objects-update' into maintJunio C Hamano2011-11-081-19/+55
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano2011-11-012-1/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cn/fetch-prune' into maintJunio C Hamano2011-11-012-6/+30
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | do not let git_path clobber errno when reporting errorsjn/git-path-errnoJonathan Nieder2011-11-172-24/+34
* | | | | | | | | | | | revert: prettify fatal messagesRamkumar Ramachandra2011-11-151-5/+5
* | | | | | | | | | | | Revert "upload-archive: use start_command instead of fork"Junio C Hamano2011-11-152-26/+48
* | | | | | | | | | | | Merge branch 'ly/mktree-using-strbuf'Junio C Hamano2011-11-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merge "Move 'builtin-*' into a 'builtin/' subdirectory"ly/mktree-using-strbufJunio C Hamano2011-11-101-0/+1
* | | | | | | | | | | | | Merge branch 'jc/remote-setbranches-usage-fix'Junio C Hamano2011-11-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | remote: fix set-branches usagejc/remote-setbranches-usage-fixJunio C Hamano2011-11-061-1/+1
* | | | | | | | | | | | | | Merge branch 'fc/remote-seturl-usage-fix'Junio C Hamano2011-11-081-1/+1
* | | | | | | | | | | | | | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-071-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | blame.c: Properly initialize strbuf after calling textconv_object(), againSebastian Schuberth2011-11-071-4/+3
* | | | | | | | | | | | | | | receive-pack: do not expect object 0{40} to existJunio C Hamano2011-11-031-6/+11
* | | | | | | | | | | | | | | branch -m: handle no arg properlyTay Ray Chuan2011-11-021-5/+8
* | | | | | | | | | | | | | | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-011-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | blame.c: Properly initialize strbuf after calling, textconv_object()Sebastian Schuberth2011-10-281-1/+3
View Lorry Controller Status