summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* clean up struct ref's nonfastforward fieldct/advise-push-defaultJeff King2012-03-262-4/+3
* push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-197-12/+99
* Git 1.7.10-rc1v1.7.10-rc1Junio C Hamano2012-03-142-4/+12
* Merge branch 'jc/i18n-shell-script-gettext'Junio C Hamano2012-03-131-1/+1
|\
| * i18n: fix auto detection of gettext scheme for shell scriptsjc/i18n-shell-script-gettextJunio C Hamano2012-03-121-1/+1
* | Merge branch 'jc/maint-undefined-i18n-observation-test'Junio C Hamano2012-03-131-14/+23
|\ \
| * | t0204: clarify the "observe undefined behaviour" testjc/maint-undefined-i18n-observation-testJunio C Hamano2012-03-091-14/+23
* | | Merge branch 'ms/maint-config-error-at-eol-linecount'Junio C Hamano2012-03-132-4/+40
|\ \ \
| * | | config: report errors at the EOL with correct line numberms/maint-config-error-at-eol-linecountMartin Stenberg2012-03-122-4/+40
* | | | Merge branch 'ph/rerere-doc'Junio C Hamano2012-03-131-7/+12
|\ \ \ \
| * | | | rerere: Document 'rerere remaining'ph/rerere-docPhil Hord2012-03-081-7/+12
* | | | | am: officially deprecate -b/--binary optionJunio C Hamano2012-03-132-4/+4
* | | | | Update draft release notes to 1.7.10 before -rc1Junio C Hamano2012-03-121-21/+12
* | | | | Merge branch 'az/verify-tag-use-gpg-config'Junio C Hamano2012-03-121-1/+9
|\ \ \ \ \
| * | | | | verify-tag: Parse GPG configuration options.az/verify-tag-use-gpg-configAlex Zepeda2012-03-081-1/+9
* | | | | | Sync with 1.7.9.4Junio C Hamano2012-03-122-1/+26
|\ \ \ \ \ \
| * | | | | | Git 1.7.9.4v1.7.9.4Junio C Hamano2012-03-124-3/+28
| * | | | | | Merge branch 'tr/maint-bundle-boundary' into maintJunio C Hamano2012-03-122-23/+36
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano2012-03-122-86/+111
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maintJunio C Hamano2012-03-121-8/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/am-3-nonstandard-popt' into maintJunio C Hamano2012-03-122-4/+22
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | git-am: error out when seeing -b/--binaryThomas Rast2012-03-121-1/+3
* | | | | | | | | | | Merge https://github.com/git-l10n/git-poJunio C Hamano2012-03-124-358/+4239
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | l10n: Improve zh_CN translation for msg "not something we can merge"Thynson2012-03-091-1/+1
| * | | | | | | | | | l10n: Improve zh_CN trans for msg that cannot fast-forwardThynson2012-03-091-1/+1
| * | | | | | | | | | l10n: Update zh_CN translation for 1.7.10-rc0Jiang Xin2012-03-081-169/+177
| * | | | | | | | | | Update Swedish translation (732t0f0u).Peter Krefting2012-03-082-1396/+1767
| * | | | | | | | | | po/sv.po: add Swedish translationPeter Krefting2012-03-081-0/+3492
| * | | | | | | | | | l10n: Update git.pot (1 new message)Jiang Xin2012-03-081-169/+175
| * | | | | | | | | | Merge v1.7.10-rc0 for git l10n updateJiang Xin2012-03-0872-683/+2034
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | l10n: Update zh_CN translation for 1.7.9.2Jiang Xin2012-03-051-3/+3
| * | | | | | | | | | | l10n: Improve commit msg for zh_CN translationThynson2012-03-021-6/+9
| * | | | | | | | | | | l10n: Improve zh_CN translation for msg that make empty commit when amend.Thynson2012-03-021-2/+2
| * | | | | | | | | | | l10n: Improve zh_CN translation for empty cherry-pick msg.Thynson2012-03-021-2/+3
| * | | | | | | | | | | l10n: Improve zh_CN translation for msg about branch deletion denyThynson2012-03-021-3/+3
| * | | | | | | | | | | l10n: Improve zh_CN translation for lines insertion and deletion.Thynson2012-03-021-2/+2
* | | | | | | | | | | | p4000: use -3000 when promising -3000Thomas Rast2012-03-091-1/+1
* | | | | | | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-03-081-10/+28
* | | | | | | | | | | | Merge branch 'kb/maint-prune-rmdir-closedir'Junio C Hamano2012-03-082-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix deletion of .git/objects sub-directories in git-prune/repackkb/maint-prune-rmdir-closedirKarsten Blees2012-03-072-3/+3
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jl/maint-submodule-relative'Junio C Hamano2012-03-083-29/+68
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | submodules: fix ambiguous absolute paths under Windowsjl/maint-submodule-relativeJohannes Sixt2012-03-041-0/+3
| * | | | | | | | | | | | submodules: refactor computation of relative gitdir pathJens Lehmann2012-03-042-24/+23
| * | | | | | | | | | | | submodules: always use a relative path from gitdir to work treeJens Lehmann2012-03-042-0/+38
| * | | | | | | | | | | | submodules: always use a relative path to gitdirJens Lehmann2012-03-042-7/+6
* | | | | | | | | | | | | Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext'Junio C Hamano2012-03-081-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | gitweb: Fix fixed string (non-regexp) project searchjn/maint-do-not-match-with-unsanitized-searchtextJakub Narebski2012-03-061-8/+8
* | | | | | | | | | | | | Merge branch 'vr/branch-doc'Junio C Hamano2012-03-081-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation/git-branch: add default for --containsvr/branch-docVincent van Ravesteijn2012-03-061-2/+3
| * | | | | | | | | | | | | Documentation/git-branch: fix a typoVincent van Ravesteijn2012-03-061-1/+1