aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jh/fetch-head-update'Junio C Hamano2012-01-06
|\
| * write first for-merge ref to FETCH_HEAD firstJoey Hess2012-01-03
* | Sync with 1.7.8.2Junio C Hamano2011-12-28
|\ \ | |/ |/|
| * Merge branch 'jv/maint-config-set' into maintJunio C Hamano2011-12-28
| |\
| | * Fix an incorrect reference to --set-all.Jelmer Vernooij2011-12-27
| * | Merge branch 'jc/checkout-m-twoway' into maintJunio C Hamano2011-12-28
| |\ \
| * \ \ Merge branch 'jk/maint-strbuf-missing-init' into maintJunio C Hamano2011-12-28
| |\ \ \
| * \ \ \ Merge branch 'jn/maint-sequencer-fixes' into maintJunio C Hamano2011-12-28
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/maint-mv' into maintJunio C Hamano2011-12-28
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/fetch-no-tail-match-refs' into maintJunio C Hamano2011-12-28
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ci/stripspace-docs' into maintJunio C Hamano2011-12-28
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano2011-12-28
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'ab/sun-studio-portability'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Appease Sun Studio by renaming "tmpfile"Ævar Arnfjörð Bjarmason2011-12-21
| * | | | | | | | | | Fix an enum assignment issue spotted by Sun StudioÆvar Arnfjörð Bjarmason2011-12-21
* | | | | | | | | | | Merge branch 'rr/revert-cherry-pick'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | revert: simplify getting commit subject in format_todo()Ramkumar Ramachandra2011-12-15
| * | | | | | | | | | | revert: tolerate extra spaces, tabs in insn sheetRamkumar Ramachandra2011-12-15
| * | | | | | | | | | | revert: make commit subjects in insn sheet optionalRamkumar Ramachandra2011-12-15
| * | | | | | | | | | | revert: free msg in format_todo()Ramkumar Ramachandra2011-12-15
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/maint-strbuf-missing-init'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Update jk/maint-strbuf-missing-init to builtin/ renameJunio C Hamano2011-12-18
* | | | | | | | | | | Merge branch 'rs/diff-tree-combined-clean-up'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use struct sha1_array in diff_tree_combined()René Scharfe2011-12-17
* | | | | | | | | | | | Merge branch 'tr/grep-threading'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | grep: disable threading in non-worktree caseThomas Rast2011-12-16
| * | | | | | | | | | | | grep: enable threading with -p and -W using lazy attribute lookupThomas Rast2011-12-16
* | | | | | | | | | | | | Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano2011-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy2011-12-15
| * | | | | | | | | | | | | merge: abort if fails to commitNguyễn Thái Ngọc Duy2011-12-15
* | | | | | | | | | | | | | Sync with v1.7.8.1Junio C Hamano2011-12-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | / / / / / / / | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano2011-12-21
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clone: the -o option has nothing to do with <branch>Carlos Martín Nieto2011-12-21
| * | | | | | | | | | | | | builtin/log: remove redundant initializationMichael Schubert2011-12-21
| * | | | | | | | | | | | | Merge branch 'ms/commit-cc-option-helpstring' into maintJunio C Hamano2011-12-21
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-12-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | builtin/init-db.c: eliminate -Wformat warning on SolarisÆvar Arnfjörð Bjarmason2011-12-20
* | | | | | | | | | | | | | Merge branch 'jc/pull-signed-tag'Junio C Hamano2011-12-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | commit: do not lose mergetag header when not amendingJunio C Hamano2011-12-20
* | | | | | | | | | | | | | | Merge branch 'jc/checkout-m-twoway'Junio C Hamano2011-12-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | checkout_merged(): squelch false warning from some gccJunio C Hamano2011-12-15
| * | | | | | | | | | | | | | checkout -m: no need to insist on having all 3 stagesJunio C Hamano2011-12-06
* | | | | | | | | | | | | | | Merge branch 'jk/fetch-no-tail-match-refs'Junio C Hamano2011-12-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | fetch-pack: match refs exactlyJeff King2011-12-13
| * | | | | | | | | | | | | | drop "match" parameter from get_remote_headsJeff King2011-12-13
* | | | | | | | | | | | | | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Rename resolve_ref() to resolve_ref_unsafe()Nguyễn Thái Ngọc Duy2011-12-13
| * | | | | | | | | | | | | | | Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-13
| * | | | | | | | | | | | | | | revert: convert resolve_ref() to read_ref_full()Nguyễn Thái Ngọc Duy2011-12-12
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jn/maint-sequencer-fixes'Junio C Hamano2011-12-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-21 05:01:48 +0000