summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* api-strbuf.txt minor typosjm/api-strbuf-docJeremiah Mahler2014-06-091-5/+5
* Sync with 1.9.4Junio C Hamano2014-05-302-1/+18
|\
| * Git 1.9.4v1.9.4Junio C Hamano2014-05-304-3/+20
| * Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-282-20/+42
| |\
| * \ Merge branch 'mw/symlinks' into maintJunio C Hamano2014-05-283-20/+112
| |\ \
* | | | t5537: re-drop http testsJeff King2014-05-301-28/+0
* | | | Git 2.0v2.0.0Junio C Hamano2014-05-282-1/+6
* | | | Update draft release notes to 2.0Junio C Hamano2014-05-211-9/+5
* | | | Git 2.0-rc4v2.0.0-rc4Junio C Hamano2014-05-201-1/+1
* | | | RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, do...Jason St. John2014-05-201-36/+37
* | | | Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"Junio C Hamano2014-05-2011-4360/+87
* | | | Merge branch 'jc/graduate-remote-hg-bzr' (early part)Junio C Hamano2014-05-196-71/+62
|\ \ \ \
| * | | | remote-helpers: point at their upstream repositoriesJunio C Hamano2014-05-191-0/+19
| * | | | contrib: remote-helpers: add move warnings (v2.0)Felipe Contreras2014-05-192-0/+6
| * | | | Revert "Merge branch 'fc/transport-helper-sync-error-fix'"Junio C Hamano2014-05-193-71/+37
* | | | | 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