summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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.1.0-rc0v2.1.0-rc0Junio C Hamano2014-07-272-1/+23
* | | Merge branch 'jk/rebase-am-fork-point'Junio C Hamano2014-07-274-8/+41
|\ \ \
| * | | rebase: omit patch-identical commits with --fork-pointjk/rebase-am-fork-pointJohn Keeping2014-07-164-6/+32
| * | | rebase--am: use --cherry-pick instead of --ignore-if-in-upstreamJohn Keeping2014-07-151-4/+11
* | | | Merge branch 'cc/replace-graft'Junio C Hamano2014-07-276-26/+313
|\ \ \ \
| * | | | replace: add test for --graft with a mergetagcc/replace-graftChristian Couder2014-07-211-0/+22
| * | | | replace: check mergetags when using --graftChristian Couder2014-07-211-0/+47
| * | | | replace: add test for --graft with signed commitChristian Couder2014-07-211-0/+24
| * | | | replace: remove signature when using --graftChristian Couder2014-07-213-0/+41
| * | | | contrib: add convert-grafts-to-replace-refs.shChristian Couder2014-07-212-1/+31
| * | | | Documentation: replace: add --graft optionChristian Couder2014-07-211-0/+8
| * | | | replace: add test for --graftChristian Couder2014-07-211-1/+44
| * | | | replace: add --graft optionChristian Couder2014-07-211-1/+73
| * | | | replace: cleanup redirection style in testsChristian Couder2014-07-071-24/+24
* | | | | Merge branch 'jk/stable-prio-queue'Junio C Hamano2014-07-274-51/+60
|\ \ \ \ \
| * | | | | t5539: update a flaky testjk/stable-prio-queueJeff King2014-07-151-0/+1
| * | | | | paint_down_to_common: use prio_queueJeff King2014-07-151-23/+19
| * | | | | prio-queue: make output stable with respect to insertionJeff King2014-07-152-6/+17
| * | | | | prio-queue: factor out compare and swap operationsJeff King2014-07-151-24/+25
* | | | | | Sync with v2.0.3Junio C Hamano2014-07-233-2/+21
|\ \ \ \ \ \
| * | | | | | Git 2.0.3v2.0.3Junio C Hamano2014-07-234-3/+21
| * | | | | | .mailmap: combine Stefan Beller's emailsStefan Beller2014-07-231-0/+1
| * | | | | | git.1: switch homepage for statsStefan Beller2014-07-231-1/+1
* | | | | | | Merge branch 'rs/fix-unlink-unix-socket'Junio C Hamano2014-07-231-1/+2
|\ \ \ \ \ \ \
| * | | | | | | unix-socket: remove stale socket before calling chdir()rs/fix-unlink-unix-socketRené Scharfe2014-07-211-1/+2
* | | | | | | | Merge branch 'ta/string-list-init'Junio C Hamano2014-07-237-15/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | replace memset with string-list initializersta/string-list-initTanay Abhra2014-07-214-15/+6
| * | | | | | | | string-list: add string_list initializer helper functionTanay Abhra2014-07-213-0/+13
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'mb/local-clone-after-applying-insteadof'Junio C Hamano2014-07-231-12/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | use local cloning if insteadOf makes a local URLmb/local-clone-after-applying-insteadofMichael Barabanov2014-07-171-12/+13
* | | | | | | | | Merge branch 'jk/tag-sort'Junio C Hamano2014-07-234-39/+115
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tag: support configuring --sort via .gitconfigjk/tag-sortJacob Keller2014-07-174-19/+95
| * | | | | | | | | tag: fix --sort tests to use cat<<-\EOF formatJacob Keller2014-07-131-20/+20