summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-tag-show-fixes' into maintJunio C Hamano2012-02-131-32/+40
|\
| * tag: do not show non-tag contents with "-n"jk/maint-tag-show-fixesJunio C Hamano2012-02-081-10/+12
| * tag: die when listing missing or corrupt objectsJeff King2012-02-061-1/+5
| * tag: fix output of "tag -n" when errors occurJeff King2012-02-061-32/+34
* | Merge branch 'jn/merge-no-edit-fix' into maintJunio C Hamano2012-02-131-3/+7
|\ \
| * | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fixJunio C Hamano2012-02-091-3/+7
* | | Merge branch 'js/add-e-submodule-fix' into maintJunio C Hamano2012-02-131-0/+1
|\ \ \
| * | | add -e: do not show difference in a submodule that is merely dirtyjs/add-e-submodule-fixJohannes Schindelin2012-02-071-0/+1
| | |/ | |/|
* | | Merge branch 'jc/parse-date-raw' into maintJunio C Hamano2012-02-131-0/+6
|\ \ \
| * | | parse_date(): '@' prefix forces git-timestampjc/parse-date-rawJunio C Hamano2012-02-031-0/+6
* | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintJunio C Hamano2012-02-131-1/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-mergeJunio C Hamano2012-02-051-1/+2
* | | | Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano2012-02-131-0/+15
|\ \ \ \
| * | | | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidanceJunio C Hamano2012-02-051-0/+15
| |/ / /
* | | | Merge branch 'tr/grep-l-with-decoration' into maintJunio C Hamano2012-02-101-2/+3
|\ \ \ \
| * | | | grep: fix -l/-L interaction with decoration linestr/grep-l-with-decorationAlbert Yale2012-01-231-2/+3
* | | | | Merge branch 'cb/push-quiet' into maintJunio C Hamano2012-02-052-7/+25
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix push --quiet: add 'quiet' capability to receive-packClemens Buchacher2012-01-082-5/+22
| * | | | server_supports(): parse feature list more carefullyJunio C Hamano2012-01-081-2/+3
* | | | | 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
View Lorry Controller Status