aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'nd/maint-ignore-exclude'Junio C Hamano2011-12-05
|\
| * checkout,merge: loosen overwriting untracked file check based on info/excludeNguyễn Thái Ngọc Duy2011-11-28
* | Merge branch 'vr/git-merge-default-to-upstream'Junio C Hamano2011-12-05
|\ \
| * | Show error for 'git merge' with unset merge.defaultToUpstreamVincent van Ravesteijn2011-11-21
* | | Merge branch 'jc/maint-pack-object-cycle'Junio C Hamano2011-12-05
|\ \ \
| * | | pack-object: tolerate broken packs that have duplicated objectsJunio C Hamano2011-11-16
* | | | Merge branch 'jc/index-pack-reject-dups'Junio C Hamano2011-12-05
|\ \ \ \
| * | | | receive-pack, fetch-pack: reject bogus pack that records objects twiceJunio C Hamano2011-11-16
* | | | | Merge branch 'ab/clang-lints'Junio C Hamano2011-12-05
|\ \ \ \ \
| * | | | | cast variable in call to free() in builtin/diff.c and submodule.cÆvar Arnfjörð Bjarmason2011-11-06
| * | | | | apply: get rid of useless x < 0 comparison on a size_t typeÆvar Arnfjörð Bjarmason2011-11-06
* | | | | | Merge branch 'nd/prune-progress'Junio C Hamano2011-12-05
|\ \ \ \ \ \
| * | | | | | prune: handle --progress/no-progressJeff King2011-11-07
| * | | | | | prune: show progress while marking reachable objectsNguyễn Thái Ngọc Duy2011-11-07
| |/ / / / /
* | | | | | Merge branch 'nd/fsck-progress'Junio C Hamano2011-12-05
|\ \ \ \ \ \
| * | | | | | fsck: print progressNguyễn Thái Ngọc Duy2011-11-06
| * | | | | | fsck: avoid reading every object twiceNguyễn Thái Ngọc Duy2011-11-06
| * | | | | | fsck: return error code when verify_pack() goes wrongNguyễn Thái Ngọc Duy2011-11-06
* | | | | | | Merge branch 'nd/misc-cleanups'Junio C Hamano2011-12-05
|\ \ \ \ \ \ \
| * | | | | | | tree_entry_interesting(): give meaningful names to return valuesNguyễn Thái Ngọc Duy2011-10-27
| * | | | | | | tree-walk.c: do not leak internal structure in tree_entry_len()Nguyễn Thái Ngọc Duy2011-10-27
* | | | | | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-05
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-05
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | stripspace: fix outdated commentJeff King2011-12-05
* | | | | | | | | builtin-branch: Fix crash on invalid use of --forceVincent van Ravesteijn2011-11-23
* | | | | | | | | revert --abort: do not leave behind useless sequencer-old directoryJonathan Nieder2011-11-23
* | | | | | | | | Fix revert --abort on WindowsJohannes Sixt2011-11-23
* | | | | | | | | revert: do not pass non-literal string as format to git_path()Nguyễn Thái Ngọc Duy2011-11-23
* | | | | | | | | revert: remove --reset compatibility optionJonathan Nieder2011-11-22
* | | | | | | | | revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder2011-11-22
* | | | | | | | | revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-22
* | | | | | | | | revert: improve error message for cherry-pick during cherry-pickJonathan Nieder2011-11-22
* | | | | | | | | revert: rearrange pick_revisions() for clarityJonathan Nieder2011-11-22
* | | | | | | | | revert: rename --reset option to --quitJonathan Nieder2011-11-22
* | | | | | | | | Sync with 1.7.7.4Junio C Hamano2011-11-18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'jc/maint-name-rev-all' into maintJunio C Hamano2011-11-18
| * | | | | | | | Merge branch 'dm/pack-objects-update' into maintJunio C Hamano2011-11-08
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano2011-11-01
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cn/fetch-prune' into maintJunio C Hamano2011-11-01
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | do not let git_path clobber errno when reporting errorsJonathan Nieder2011-11-17
* | | | | | | | | | | | revert: prettify fatal messagesRamkumar Ramachandra2011-11-15
* | | | | | | | | | | | Revert "upload-archive: use start_command instead of fork"Junio C Hamano2011-11-15
* | | | | | | | | | | | Merge branch 'ly/mktree-using-strbuf'Junio C Hamano2011-11-11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merge "Move 'builtin-*' into a 'builtin/' subdirectory"Junio C Hamano2011-11-10
* | | | | | | | | | | | | Merge branch 'jc/remote-setbranches-usage-fix'Junio C Hamano2011-11-08
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | remote: fix set-branches usageJunio C Hamano2011-11-06
* | | | | | | | | | | | | | Merge branch 'fc/remote-seturl-usage-fix'Junio C Hamano2011-11-08
* | | | | | | | | | | | | | Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | blame.c: Properly initialize strbuf after calling textconv_object(), againSebastian Schuberth2011-11-07
* | | | | | | | | | | | | | receive-pack: do not expect object 0{40} to existJunio C Hamano2011-11-03