summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t3404: cleanup double empty lines between testssb/rebase-xStefan Beller2016-03-181-6/+0
* rebase: decouple --exec from --interactiveStefan Beller2016-03-183-16/+10
* RelNotes: remove the mention of !reinclusionJunio C Hamano2016-03-181-5/+0
* Revert "Merge branch 'nd/exclusion-regression-fix'"Junio C Hamano2016-03-187-378/+12
* Revert "Merge branch 'jc/exclusion-doc'"Junio C Hamano2016-03-181-37/+1
* Sync with Git 2.7.4Junio C Hamano2016-03-175-3/+50
|\
| * Git 2.7.4v2.7.4Junio C Hamano2016-03-173-2/+13
| * Sync with Git 2.6.6Junio C Hamano2016-03-174-3/+39
| |\
| | * Git 2.6.6v2.6.6Junio C Hamano2016-03-174-3/+15
| | * Merge branch 'maint-2.5' into maint-2.6Junio C Hamano2016-03-1716-148/+110
| | |\
| | | * Git 2.5.5v2.5.5Junio C Hamano2016-03-174-3/+15
| | | * Merge branch 'maint-2.4' into maint-2.5Junio C Hamano2016-03-1715-147/+97
| | | |\
| | | | * Git 2.4.11v2.4.11Junio C Hamano2016-03-174-3/+15
| | | | * Merge branch 'jk/path-name-safety-2.4' into maint-2.4Junio C Hamano2016-03-1713-146/+84
| | | | |\
* | | | | | Git 2.8-rc3v2.8.0-rc3Junio C Hamano2016-03-162-1/+18
* | | | | | Merge branch 'master' of git://bogomips.org/git-svnJunio C Hamano2016-03-162-6/+14
|\ \ \ \ \ \
| * | | | | | git-svn: fix URL canonicalization during init w/ SVN 1.7+Eric Wong2016-03-162-7/+9
| * | | | | | t9117: test specifying full url to git svn init -TAdam Dinwoodie2016-03-161-0/+6
* | | | | | | Sync with maintJunio C Hamano2016-03-160-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'jk/path-name-safety-2.7' into maintJunio C Hamano2016-03-1610-142/+46
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7jk/path-name-safety-2.7Junio C Hamano2016-03-1610-142/+46
| | |\ \ \ \ \ \ | |/ / / / / / /
| | * | | | | | Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6jk/path-name-safety-2.6Junio C Hamano2016-03-1613-146/+84
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5jk/path-name-safety-2.5Junio C Hamano2016-03-1613-146/+84
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | / | | | | | |_|/ | | | | |/| |
| | | | * | | list-objects: pass full pathname to callbacksjk/path-name-safety-2.4Jeff King2016-03-169-58/+26
| | | | * | | list-objects: drop name_path entirelyJeff King2016-03-169-25/+19
| | | | * | | list-objects: convert name_path to a strbufJeff King2016-03-163-36/+15
| | | | * | | show_object_with_name: simplify by using path_name()Jeff King2016-03-161-34/+6
| | | | * | | http-push: stop using name_pathJeff King2016-03-161-16/+7
| | | | * | | tree-diff: catch integer overflow in combine_diff_path allocationJeff King2016-03-162-4/+4
| | | | * | | add helpers for detecting size_t overflowJeff King2016-03-161-0/+34
| | | | | |/ | | | | |/|
* | | | | | Merge branch 'jc/sane-grep'Junio C Hamano2016-03-165-4/+17
|\ \ \ \ \ \
| * | | | | | rebase-i: clarify "is this commit relevant?" testjc/sane-grepJunio C Hamano2016-03-101-1/+2
| * | | | | | sane_grep: pass "-a" if grep accepts itJunio C Hamano2016-03-104-3/+15
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'cn/deprecate-ssh-git-url'Junio C Hamano2016-03-163-5/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Disown ssh+git and git+sshcn/deprecate-ssh-git-urlCarlos Martín Nieto2016-03-093-5/+6
* | | | | | RelNotes for 2.8.0: typofixJunio C Hamano2016-03-151-14/+10
* | | | | | Merge branch 'svn-glob' of git://bogomips.org/git-svnJunio C Hamano2016-03-155-13/+258
|\ \ \ \ \ \
| * | | | | | git-svn: shorten glob error messageEric Wong2016-03-154-11/+18
| * | | | | | git-svn: loosen config globs limitationsVictor Leschuk2016-03-153-5/+243
* | | | | | | Merge tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2016-03-159-11003/+12830
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | l10n: zh_CN: for git v2.8.0 l10n round 3Jiang Xin2016-03-161-2/+6
| * | | | | | l10n: git.pot: Add one new message for Git 2.8.0Jiang Xin2016-03-161-1/+5
| * | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2016-03-169-11003/+12822
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | l10n: zh_CN: for git v2.8.0 l10n round 2Jiang Xin2016-03-161-20/+121
| * | | | | | l10n: fr.po v2.8.0 round 2Jean-Noel Avila2016-03-141-31/+134
| * | | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-03-131-24/+121
| |\ \ \ \ \ \
| | * | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-03-131-24/+121
| * | | | | | | l10n: ko: Update Korean translationChangwoo Ryu2016-03-131-17/+118
| |/ / / / / /
| * | | | | | l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)Jiang Xin2016-03-121-14/+111
| * | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2016-03-129-10936/+12256
| |\ \ \ \ \ \