summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* branch: don't assume the merge filter ref existscn/maint-branch-with-badCarlos Martín Nieto2012-02-271-0/+4
* Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-121-2/+7
|\
| * Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-121-2/+7
| |\
| | * thin-pack: try harder to use preferred base objects as baseJeff King2012-01-121-2/+7
* | | Merge branch 'jv/maint-config-set' into maintJunio C Hamano2011-12-281-1/+1
|\ \ \
| * | | Fix an incorrect reference to --set-all.jv/maint-config-setJelmer Vernooij2011-12-271-1/+1
* | | | Merge branch 'jc/checkout-m-twoway' into maintJunio C Hamano2011-12-281-24/+36
|\ \ \ \
| * | | | checkout_merged(): squelch false warning from some gccJunio C Hamano2011-12-151-1/+1
| * | | | checkout -m: no need to insist on having all 3 stagesJunio C Hamano2011-12-061-24/+36
* | | | | Merge branch 'jk/maint-strbuf-missing-init' into maintJunio C Hamano2011-12-282-2/+2
|\ \ \ \ \
| * | | | | Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-initJunio C Hamano2011-12-182-2/+2
* | | | | | Merge branch 'jn/maint-sequencer-fixes' into maintJunio C Hamano2011-12-281-48/+92
|\ \ \ \ \ \
| * | | | | | revert: stop creating and removing sequencer-old directoryjn/maint-sequencer-fixesJonathan Nieder2011-12-121-3/+3
| * | | | | | revert: do not remove state until sequence is finishedJonathan Nieder2011-12-121-11/+1
| * | | | | | revert: allow single-pick in the middle of cherry-pick sequenceJonathan Nieder2011-12-121-0/+26
| * | | | | | revert: pass around rev-list args in already-parsed formJonathan Nieder2011-12-121-24/+29
| * | | | | | revert: allow cherry-pick --continue to commit before resumingJonathan Nieder2011-12-121-3/+20
| * | | | | | revert: give --continue handling its own functionJonathan Nieder2011-12-121-11/+17
* | | | | | | Merge branch 'jk/maint-mv' into maintJunio C Hamano2011-12-281-2/+4
|\ \ \ \ \ \ \
| * | | | | | | mv: be quiet about overwritingjk/maint-mvJeff King2011-12-121-1/+2
| * | | | | | | mv: improve overwrite warningJeff King2011-12-121-1/+1
| * | | | | | | mv: make non-directory destination error more clearJeff King2011-12-121-1/+1
| * | | | | | | mv: honor --verbose flagJeff King2011-12-121-0/+1
* | | | | | | | Merge branch 'jk/fetch-no-tail-match-refs' into maintJunio C Hamano2011-12-282-7/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch-pack: match refs exactlyJeff King2011-12-131-4/+9
| * | | | | | | | drop "match" parameter from get_remote_headsJeff King2011-12-132-3/+2
* | | | | | | | | Merge branch 'ci/stripspace-docs' into maintJunio C Hamano2011-12-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update documentation for stripspaceci/stripspace-docsConrad Irwin2011-12-121-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano2011-12-282-6/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-selfJonathan Nieder2011-11-282-5/+12
| * | | | | | | | | branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder2011-11-281-1/+8
* | | | | | | | | | Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano2011-12-211-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/apply.c: report error on failure to recognize inputbc/maint-apply-check-no-patchBrandon Casey2011-12-051-5/+5
* | | | | | | | | | | clone: the -o option has nothing to do with <branch>Carlos Martín Nieto2011-12-211-2/+2
* | | | | | | | | | | builtin/log: remove redundant initializationMichael Schubert2011-12-211-2/+0
* | | | | | | | | | | Merge branch 'ms/commit-cc-option-helpstring' into maintJunio C Hamano2011-12-211-1/+1
* | | | | | | | | | | builtin/init-db.c: eliminate -Wformat warning on SolarisÆvar Arnfjörð Bjarmason2011-12-201-1/+1
* | | | | | | | | | | 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
View Lorry Controller Status