summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-192-20/+42
|\
| * git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refnameRichard Hansen2014-05-192-20/+42
* | Merge branch 'lt/request-pull'Junio C Hamano2014-05-192-1/+13
|\ \
| * | request-pull: resurrect for-linus -> tags/for-linus DWIMJunio C Hamano2014-05-162-1/+13
* | | Merge branch 'jl/use-vsatisfy-correctly-for-2.0'Junio C Hamano2014-05-191-2/+2
|\ \ \
| * | | git-gui: tolerate major version changes when comparing the git versionjl/use-vsatisfy-correctly-for-2.0Jens Lehmann2014-05-191-2/+2
* | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2014-05-191-21/+21
|\ \ \ \
| * | | | fr: a lot of good fixupsGrégoire Paris2014-05-171-21/+21
* | | | | Merge branch 'kb/fast-hashmap'Junio C Hamano2014-05-191-1/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Documentation/technical/api-hashmap: remove source highlightingkb/fast-hashmapAnders Kaseorg2014-05-191-1/+0
* | | | | Merge branch 'fc/prompt-zsh-read-from-file'Junio C Hamano2014-05-131-8/+8
|\ \ \ \ \
| * | | | | contrib: completion: fix 'eread()' namespacefc/prompt-zsh-read-from-fileFelipe Contreras2014-05-131-8/+8
* | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2014-05-121-2278/+2755
|\ \ \ \ \ \
| * | | | | | l10n: Updated Bulgarian translation of git (1307t0f921u)Alexander Shopov2014-05-111-2278/+2755
|/ / / / / /
* | | | | | Git 2.0-rc3v2.0.0-rc3Junio C Hamano2014-05-091-1/+1
* | | | | | Sync with 1.9.3Junio C Hamano2014-05-091-1/+2
|\ \ \ \ \ \
| * | | | | | Git 1.9.3v1.9.3Junio C Hamano2014-05-092-2/+3
* | | | | | | Sync with maintJunio C Hamano2014-05-082-1/+22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | shell doc: remove stray "+" in exampleJonathan Nieder2014-05-081-1/+1
| * | | | | | Start preparing for 1.9.3Junio C Hamano2014-05-082-1/+22
| * | | | | | Merge branch 'cl/p4-use-diff-tree' into maintJunio C Hamano2014-05-081-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-082-24/+54
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'km/avoid-non-function-return-in-rebase' into maintJunio C Hamano2014-05-084-10/+46
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tb/unicode-6.3-zero-width' into maintJunio C Hamano2014-05-081-5/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'km/avoid-bs-in-shell-glob' into maintJunio C Hamano2014-05-081-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'km/avoid-cp-a' into maintJunio C Hamano2014-05-081-2/+2
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge git://github.com/git-l10n/git-poJunio C Hamano2014-05-081-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | l10n: Fix a couple of typos in the Swedish translationPeter Krefting2014-05-071-7/+7
* | | | | | | | | | | | | Update draft release notes for 2.0Junio C Hamano2014-05-071-2/+6
* | | | | | | | | | | | | Merge branch 'cl/p4-use-diff-tree'Junio C Hamano2014-05-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | git-p4: format-patch to diff-tree change breaks binary patchescl/p4-use-diff-treeTolga Ceylan2014-05-071-1/+1
* | | | | | | | | | | | | RelNotes/2.0.0: Grammar and typo fixesØyvind A. Holm2014-05-061-5/+5
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / /