summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* merge: add instructions to the commit message when editingtr/merge-edit-guidanceThomas Rast2012-01-311-0/+10
* Merge branch 'maint'Junio C Hamano2012-01-121-2/+7
|\
| * 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 'mh/ref-api-less-extra-refs'Junio C Hamano2012-01-091-29/+22
|\ \ \ \
| * | | | write_head_info(): handle "extra refs" locallymh/ref-api-less-extra-refsMichael Haggerty2012-01-061-4/+3
| * | | | show_ref(): remove unused "flag" and "cb_data" argumentsMichael Haggerty2012-01-061-5/+5
| * | | | receive-pack: move more work into write_head_info()Michael Haggerty2012-01-061-24/+18
* | | | | Merge branch 'jc/show-sig'Junio C Hamano2012-01-063-7/+46
|\ \ \ \ \
| * | | | | commit --amend -S: strip existing gpgsig headersJunio C Hamano2012-01-051-1/+2
| * | | | | Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'Junio C Hamano2012-01-053-6/+46
| |\ \ \ \ \
| | * | | | | commit: teach --gpg-sign optionJunio C Hamano2011-11-123-6/+46
* | | | | | | Merge branch 'jh/fetch-head-update'Junio C Hamano2012-01-061-74/+86
|\ \ \ \ \ \ \
| * | | | | | | write first for-merge ref to FETCH_HEAD firstjh/fetch-head-updateJoey Hess2012-01-031-74/+86
* | | | | | | | Sync with 1.7.8.2Junio C Hamano2011-12-281-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-strbuf-missing-init' into maintJunio C Hamano2011-12-282-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jn/maint-sequencer-fixes' into maintJunio C Hamano2011-12-281-48/+92
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-mv' into maintJunio C Hamano2011-12-281-2/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fetch-no-tail-match-refs' into maintJunio C Hamano2011-12-282-7/+11
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ci/stripspace-docs' into maintJunio C Hamano2011-12-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano2011-12-282-6/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ 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
View Lorry Controller Status