summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gitweb: Fix "heads" view when there is no current branchjn/gitweb-unborn-headJakub Narebski2012-02-172-2/+11
* Git 1.7.9.1v1.7.9.1Junio C Hamano2012-02-143-2/+14
* Merge branch 'jk/maint-tag-show-fixes' into maintJunio C Hamano2012-02-132-32/+53
|\
| * tag: do not show non-tag contents with "-n"jk/maint-tag-show-fixesJunio C Hamano2012-02-082-10/+25
| * 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 'bw/inet-pton-ntop-compat' into maintJunio C Hamano2012-02-132-12/+0
|\ \
| * | Drop system includes from inet_pton/inet_ntop compatibility wrappersbw/inet-pton-ntop-compatBen Walton2012-02-052-12/+0
* | | Merge branch 'mp/make-cleanse-x-for-exe' into maintJunio C Hamano2012-02-131-0/+3
|\ \ \
| * | | Explicitly set X to avoid potential build breakagemp/make-cleanse-x-for-exeMichael Palimaka2012-02-091-0/+3
* | | | Merge branch 'jn/merge-no-edit-fix' into maintJunio C Hamano2012-02-132-3/+19
|\ \ \ \
| * | | | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fixJunio C Hamano2012-02-092-3/+19
* | | | | Update draft release notes to 1.7.9.1Junio C Hamano2012-02-131-3/+19
* | | | | 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-134-1/+60
|\ \ \ \ \
| * | | | | parse_date(): '@' prefix forces git-timestampjc/parse-date-rawJunio C Hamano2012-02-034-2/+32
| * | | | | parse_date(): allow ancient git-timestampJunio C Hamano2012-02-031-0/+29
* | | | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintJunio C Hamano2012-02-132-1/+15
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-mergeJunio C Hamano2012-02-052-1/+15
* | | | | | Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano2012-02-133-4/+61
|\ \ \ \ \ \
| * | | | | | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidanceJunio C Hamano2012-02-052-4/+52
| * | | | | | tests: add write_script helper functionJunio C Hamano2012-02-031-0/+9
| |/ / / / /
* | | | | | Merge branch 'jn/rpm-spec' into maintJunio C Hamano2012-02-131-0/+1
|\ \ \ \ \ \
| * | | | | | git.spec: Workaround localized messages not put in any RPMjn/rpm-specJakub Narebski2012-02-031-0/+1
| |/ / / / /
* | | | | | t: use sane_unset instead of unsetÆvar Arnfjörð Bjarmason2012-02-136-10/+10
* | | | | | Remove Git's support for smoke testingÆvar Arnfjörð Bjarmason2012-02-133-133/+1
* | | | | | Makefile: Change the default compiler from "gcc" to "cc"Ævar Arnfjörð Bjarmason2012-02-131-1/+1
* | | | | | Update draft release notes to 1.7.9.1Junio C Hamano2012-02-101-0/+17
* | | | | | Merge branch 'jc/maint-request-pull-for-tag' into maintJunio C Hamano2012-02-103-8/+4
|\ \ \ \ \ \
| * | | | | | request-pull: explicitly ask tags/$name to be pulledjc/maint-request-pull-for-tagJunio C Hamano2012-01-313-8/+4
* | | | | | | Merge branch 'tr/grep-l-with-decoration' into maintJunio C Hamano2012-02-102-2/+25
|\ \ \ \ \ \ \
| * | | | | | | grep: fix -l/-L interaction with decoration linestr/grep-l-with-decorationAlbert Yale2012-01-232-2/+25
* | | | | | | | Merge branch 'jl/submodule-re-add' into maintJunio C Hamano2012-02-102-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule add: fix breakage when re-adding a deep submodulejl/submodule-re-addJens Lehmann2012-01-242-0/+9
* | | | | | | | | Merge branch 'da/maint-mergetool-twoway' into maintJunio C Hamano2012-02-102-5/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mergetool: Provide an empty file when neededda/maint-mergetool-twowayDavid Aguilar2012-01-232-5/+35
* | | | | | | | | | Prepare for 1.7.9.1Junio C Hamano2012-02-062-1/+20
* | | | | | | | | | completion: --edit and --no-edit for git-mergeAdrian Weimann2012-02-061-1/+1
* | | | | | | | | | Merge branch 'sp/smart-http-failure-to-push' into maintJunio C Hamano2012-02-052-4/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remote-curl: Fix push status report when all branches failShawn O. Pearce2012-01-202-4/+33
* | | | | | | | | | | Merge branch 'jc/maint-log-first-parent-pathspec' into maintJunio C Hamano2012-02-052-1/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Making pathspec limited log play nicer with --first-parentjc/maint-log-first-parent-pathspecJunio C Hamano2012-01-192-1/+10
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'cb/push-quiet' into maintJunio C Hamano2012-02-058-19/+78
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5541: avoid TAP test miscountingcb/push-quietMichael J Gruber2012-01-081-1/+1
| * | | | | | | | | | | fix push --quiet: add 'quiet' capability to receive-packClemens Buchacher2012-01-085-6/+40
| * | | | | | | | | | | server_supports(): parse feature list more carefullyJunio C Hamano2012-01-084-13/+38
* | | | | | | | | | | | Merge branch 'cb/maint-kill-subprocess-upon-signal' into maintJunio C Hamano2012-02-053-1/+72
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | dashed externals: kill children on exitcb/maint-kill-subprocess-upon-signalClemens Buchacher2012-01-083-1/+3
| * | | | | | | | | | | | run-command: optionally kill children on exitJeff King2012-01-082-0/+69
| |/ / / / / / / / / / /