summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* contrib: remove git-diffalljn/contrib-remove-diffallJonathan Nieder2014-05-092-288/+0
* Git 2.0-rc2v2.0.0-rc2Junio C Hamano2014-05-022-2/+7
* Merge branch 'mw/symlinks'Junio C Hamano2014-05-021-2/+2
|\
| * setup: fix windows path buffer over-steppingmw/symlinksMartin Erik Werner2014-04-241-2/+2
* | Merge branch 'km/git-svn-workaround-older-getopt-long'Junio C Hamano2014-05-022-4/+7
|\ \
| * | t9117: use --prefix "" instead of --prefix=""km/git-svn-workaround-older-getopt-longKyle J. McKay2014-04-232-4/+7
* | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-022-24/+54
|\ \ \
| * | | git-prompt.sh: don't put unsanitized branch names in $PS1Richard Hansen2014-04-222-24/+54
* | | | Merge branch 'mk/doc-git-gui-display-untracked'Junio C Hamano2014-05-021-0/+4
|\ \ \ \
| * | | | Documentation: git-gui: describe gui.displayuntrackedmk/doc-git-gui-display-untrackedMax Kirillov2014-04-211-0/+4
* | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2014-04-306-7963/+8342
|\ \ \ \ \
| * | | | | l10n: de.po: improve hint for autocorrected command executionRalf Thielow2014-04-291-2/+2
| * | | | | l10n: de.po: translate 45 new messagesRalf Thielow2014-04-291-1340/+1425
| * | | | | l10n: de.po: correct translation of "completed" after resolving deltasRalf Thielow2014-04-291-1/+1
| * | | | | l10n: zh_CN.po: translate 46 new messages (2229t0f0u)Jiang Xin2014-04-231-1313/+1392
| * | | | | Merge branch 'fr-po' of git://github.com/jnavila/gitJiang Xin2014-04-231-1340/+1409
| |\ \ \ \ \
| | * | | | | l10n: fr translation for v2.0.0rc0 (2228t)Jean-Noel Avila2014-04-221-1340/+1409
| * | | | | | l10n: Update Swedish translation (2228t0f0u)Peter Krefting2014-04-221-1319/+1391
| * | | | | | l10n: vi.po (2228t): Update and minor fixTran Ngoc Quan2014-04-201-1385/+1458
| |/ / / / /
| * | | | | l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)Jiang Xin2014-04-191-1263/+1264
| |/ / / /
* | | | | Revert the whole "ask curl-config" topic for nowJunio C Hamano2014-04-301-50/+14
* | | | | Merge branch 'db/make-with-curl'Junio C Hamano2014-04-281-13/+28
|\ \ \ \ \
| * | | | | Makefile: default to -lcurl when no CURL_CONFIG or CURLDIRdb/make-with-curlDave Borowitz2014-04-281-13/+28
* | | | | | Merge branch 'jk/external-diff-use-argv-array' (early part)Junio C Hamano2014-04-281-16/+16
|\ \ \ \ \ \
| * | | | | | run_external_diff: use an argv_array for the command lineJeff King2014-04-211-16/+16
* | | | | | | Git 2.0-rc1v2.0.0-rc1Junio C Hamano2014-04-252-1/+6
* | | | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-04-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | ewah_bitmap.c: do not assume size_t and eword_t are the same sizeKyle J. McKay2014-04-221-1/+1
* | | | | | | | Merge branch 'fc/transport-helper-sync-error-fix'Junio C Hamano2014-04-242-37/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | t5801 (remote-helpers): cleanup environment setsfc/transport-helper-sync-error-fixFelipe Contreras2014-04-211-7/+4
| * | | | | | | | transport-helper: fix sync issue on crashesFelipe Contreras2014-04-142-3/+30
| * | | | | | | | transport-helper: trivial cleanupFelipe Contreras2014-04-141-12/+12
| * | | | | | | | transport-helper: propagate recvline() error pushingFelipe Contreras2014-04-141-7/+11
| * | | | | | | | remote-helpers: make recvline return an errorFelipe Contreras2014-04-141-7/+14
| * | | | | | | | transport-helper: remove barely used xchgline()Felipe Contreras2014-04-141-7/+2
* | | | | | | | | Merge branch 'db/make-with-curl'Junio C Hamano2014-04-241-12/+33
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Makefile: allow static linking against libcurlDave Borowitz2014-04-151-3/+13
| * | | | | | | Makefile: use curl-config to determine curl flagsDave Borowitz2014-04-151-12/+23
| |/ / / / / /
* | | | | | | Update draft release notes to 2.0Junio C Hamano2014-04-211-3/+12
* | | | | | | Merge git://bogomips.org/git-svnJunio C Hamano2014-04-2120-153/+131
|\ \ \ \ \ \ \
| * | | | | | | Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not givenJohan Herland2014-04-1920-153/+131
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jx/i18n'Junio C Hamano2014-04-215-15/+15
|\ \ \ \ \ \ \
| * | | | | | | i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelinesjx/i18nJunio C Hamano2014-04-181-0/+10
| * | | | | | | i18n: only extract comments marked with "TRANSLATORS:"Jiang Xin2014-04-172-6/+4
| * | | | | | | i18n: remove obsolete comments for translators in diffstat generationJiang Xin2014-04-171-8/+0
| * | | | | | | i18n: fix uncatchable comments for translators in date.cJiang Xin2014-04-171-1/+1
* | | | | | | | Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano2014-04-214-10/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"km/avoid-non-function-return-in-rebaseKyle J. McKay2014-04-171-10/+1
| * | | | | | | | rebase: avoid non-function use of "return" on FreeBSDKyle J. McKay2014-04-173-0/+45
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-04-2114-48/+48
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |