summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/sun-studio-portability'Junio C Hamano2011-12-222-5/+5
|\
| * Appease Sun Studio by renaming "tmpfile"ab/sun-studio-portabilityÆvar Arnfjörð Bjarmason2011-12-211-3/+3
| * Fix an enum assignment issue spotted by Sun StudioÆvar Arnfjörð Bjarmason2011-12-211-2/+2
* | Merge branch 'rr/revert-cherry-pick'Junio C Hamano2011-12-221-23/+25
|\ \
| * | revert: simplify getting commit subject in format_todo()Ramkumar Ramachandra2011-12-151-5/+5
| * | revert: tolerate extra spaces, tabs in insn sheetRamkumar Ramachandra2011-12-151-6/+12
| * | revert: make commit subjects in insn sheet optionalRamkumar Ramachandra2011-12-151-21/+16
| * | revert: free msg in format_todo()Ramkumar Ramachandra2011-12-151-0/+1
* | | Merge branch 'jk/maint-strbuf-missing-init'Junio C Hamano2011-12-222-2/+2
|\ \ \
| * | | Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-initJunio C Hamano2011-12-182-2/+2
* | | | Merge branch 'rs/diff-tree-combined-clean-up'Junio C Hamano2011-12-221-6/+6
|\ \ \ \
| * | | | use struct sha1_array in diff_tree_combined()René Scharfe2011-12-171-6/+6
* | | | | Merge branch 'tr/grep-threading'Junio C Hamano2011-12-221-15/+20
|\ \ \ \ \
| * | | | | grep: disable threading in non-worktree casetr/grep-threadingThomas Rast2011-12-161-18/+18
| * | | | | grep: enable threading with -p and -W using lazy attribute lookupThomas Rast2011-12-161-4/+9
* | | | | | Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano2011-12-224-6/+8
|\ \ \ \ \ \
| * | | | | | Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy2011-12-154-6/+6
| * | | | | | merge: abort if fails to commitNguyễn Thái Ngọc Duy2011-12-151-2/+4
* | | | | | | Sync with v1.7.8.1Junio C Hamano2011-12-213-5/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano2011-12-211-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
* | | | | | | | Merge branch 'maint'Junio C Hamano2011-12-201-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | builtin/init-db.c: eliminate -Wformat warning on SolarisÆvar Arnfjörð Bjarmason2011-12-201-1/+1
* | | | | | | | Merge branch 'jc/pull-signed-tag'Junio C Hamano2011-12-201-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: do not lose mergetag header when not amendingJunio C Hamano2011-12-201-1/+5
* | | | | | | | | Merge branch 'jc/checkout-m-twoway'Junio C Hamano2011-12-191-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/fetch-no-tail-match-refs'Junio C Hamano2011-12-192-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 'nd/resolve-ref'Junio C Hamano2011-12-1914-50/+41
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rename resolve_ref() to resolve_ref_unsafe()nd/resolve-refNguyễn Thái Ngọc Duy2011-12-138-9/+9
| * | | | | | | | | | | Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-138-40/+31
| * | | | | | | | | | | revert: convert resolve_ref() to read_ref_full()Nguyễn Thái Ngọc Duy2011-12-121-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jn/maint-sequencer-fixes'Junio C Hamano2011-12-191-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'Junio C Hamano2011-12-191-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 'ci/stripspace-docs'Junio C Hamano2011-12-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \