summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'jk/prompt-stash-could-be-packed' into maintJunio C Hamano2014-09-191-1/+2
|\ \ \ \ \ \ \
| * | | | | | | git-prompt: do not look for refs/stash in $GIT_DIRjk/prompt-stash-could-be-packedJeff King2014-08-251-1/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rs/refresh-beyond-symlink' into maintJunio C Hamano2014-09-192-0/+51
|\ \ \ \ \ \ \
| * | | | | | | read-cache: check for leading symlinks when refreshing indexrs/refresh-beyond-symlinkRené Scharfe2014-08-102-0/+51
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'lf/bundle-exclusion' into maintJunio C Hamano2014-09-192-3/+6
|\ \ \ \ \ \ \
| * | | | | | | bundle: fix exclusion of annotated tagslf/bundle-exclusionLukas Fleischer2014-08-072-3/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jc/apply-ws-prefix' into maintJunio C Hamano2014-09-193-63/+96
|\ \ \ \ \ \ \
| * | | | | | | apply: omit ws check for excluded pathsjc/apply-ws-prefixJunio C Hamano2014-08-072-3/+17
| * | | | | | | apply: hoist use_patch() helper for path exclusion upJunio C Hamano2014-08-071-38/+43
| * | | | | | | apply: use the right attribute for paths in non-Git patchesJunio C Hamano2014-08-072-22/+36
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/command-line-config-empty-string' into maintJunio C Hamano2014-09-193-2/+26
|\ \ \ \ \ \ \
| * | | | | | | config: teach "git -c" to recognize an empty stringjk/command-line-config-empty-stringJunio C Hamano2014-08-053-2/+26
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/pretty-empty-format' into maintJunio C Hamano2014-09-195-6/+14
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | pretty: make empty userformats truly emptyjk/pretty-empty-formatJeff King2014-07-304-3/+11
| * | | | | | pretty: treat "--format=" as an empty userformatJeff King2014-07-301-2/+2
| * | | | | | revision: drop useless string offset when parsing "--pretty"Jeff King2014-07-301-1/+1
* | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2014-08-292-1359/+1515
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | po/TEAMS: add new members to German translation teamRalf Thielow2014-08-291-0/+2
| * | | | | | l10n: de.po: translate 38 new messagesRalf Thielow2014-08-291-1359/+1513
* | | | | | | Merge branch 'jk/diff-tree-t-fix'Junio C Hamano2014-08-262-1/+45
|\ \ \ \ \ \ \
| * | | | | | | intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fixJeff King2014-08-202-1/+45
* | | | | | | | Merge branch 'jk/pack-shallow-always-without-bitmap'Junio C Hamano2014-08-262-0/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | pack-objects: turn off bitmaps when we see --shallow linesjk/pack-shallow-always-without-bitmapJeff King2014-08-122-0/+40
* | | | | | | | | Merge branch 'jk/fix-profile-feedback-build'Junio C Hamano2014-08-261-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: make perf tests optional for profile buildjk/fix-profile-feedback-buildJeff King2014-08-191-1/+5
* | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2014-08-259-9039/+21279
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | l10n: de.po: improve message when switching branchesRalf Thielow2014-08-231-3/+3
| * | | | | | | | l10n: de.po: fix typoRalf Thielow2014-08-231-2/+2
| * | | | | | | | po/TEAMS: Add Catalan teamAlex Henrie2014-08-221-0/+4
| * | | | | | | | l10n: Add Catalan translationAlex Henrie2014-08-221-0/+10951
| * | | | | | | | l10n: fr.po (2257t) update for version 2.1.0Jean-Noel Avila2014-08-071-1353/+1518
| * | | | | | | | Merge remote-tracking branch 'l10n/vi/vnwildman/master'Jiang Xin2014-08-051-1350/+1503
| |\ \ \ \ \ \ \ \
| | * | | | | | | | l10n: vi.po (2257t): Update translationTran Ngoc Quan2014-08-051-1350/+1503
| * | | | | | | | | Merge branch 'master' of github.com:alshopov/git-poJiang Xin2014-08-051-549/+601
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | l10n: Updated Bulgarian translation of git (2257t,0f,0u)Alexander Shopov2014-08-041-549/+601
| | |/ / / / / / / /
| * | | | | | | | | l10n: sv.po: Update Swedish translation (2257t0f0u)Peter Krefting2014-08-051-1342/+1493
| |/ / / / / / / /
| * | | | | | | | l10n: zh_CN: translations for git v2.1.0-rc0Jiang Xin2014-08-041-1342/+1480
| * | | | | | | | Merge commit 'bg/alshopov/master'Jiang Xin2014-08-041-2208/+2694
| |\ \ \ \ \ \ \ \
| | * | | | | | | | l10n: Updated Bulgarian translation of git (2247t,0f,0u)Alexander Shopov2014-08-031-1252/+1348
| | * | | | | | | | l10n: Updated Bulgarian translation of git (2228t,0f,0u)Alexander Shopov2014-08-031-962/+1352
| * | | | | | | | | Merge remote-tracking branch 'sv/nafmo/master'Jiang Xin2014-08-041-19/+19
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | l10n: Fix more typos in the Swedish translationsPeter Krefting2014-06-241-19/+19
| * | | | | | | | | | l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)Jiang Xin2014-08-041-1332/+1472
* | | | | | | | | | | Git 2.1v2.1.0Junio C Hamano2014-08-152-1/+6
* | | | | | | | | | | tests: fix negated test_i18ngrep callsJohannes Sixt2014-08-133-6/+6
* | | | | | | | | | | Merge branch 'master' of git://ozlabs.org/~paulus/gitkJunio C Hamano2014-08-102-323/+341
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitk: Updated Bulgarian translation (302t,0f,0u)Alexander Shopov2014-08-081-323/+329
| * | | | | | | | | | | gitk: Add keybinding to switch to parent commitMax Kirillov2014-08-081-0/+12
* | | | | | | | | | | | Git 2.1-rc2v2.1.0-rc2Junio C Hamano2014-08-081-1/+1
* | | | | | | | | | | | Merge branch 'mb/relnotes-2.1'Junio C Hamano2014-08-071-61/+53
|\ \ \ \ \ \ \ \ \ \ \ \