summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | diff_filespec: use only 2 bits for is_binary flagJeff King2014-01-171-1/+1
| * | | | | | | diff_filespec: reorder is_binary fieldJeff King2014-01-171-1/+1
| * | | | | | | diff_filespec: drop xfrm_flags fieldJeff King2014-01-172-3/+2
| * | | | | | | diff_filespec: drop funcname_pattern_ident fieldJeff King2014-01-171-1/+0
| * | | | | | | diff_filespec: reorder dirty_submodule macro definitionsJeff King2014-01-171-1/+1
* | | | | | | | Merge branch 'ef/mingw-write'Junio C Hamano2014-01-275-25/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | mingw: remove mingw_writeef/mingw-writeErik Faye-Lund2014-01-172-20/+0
| * | | | | | | | prefer xwrite instead of writeErik Faye-Lund2014-01-173-5/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'rk/send-email-ssl-cert'Junio C Hamano2014-01-271-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | send-email: /etc/ssl/certs/ directory may not be usable as ca_pathrk/send-email-ssl-certRuben Kerkhof2014-01-161-1/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'jn/ignore-doc'Junio C Hamano2014-01-271-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | gitignore doc: add global gitignore to synopsisjn/ignore-docJonathan Nieder2014-01-161-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/interpret-branch-name-fix'Junio C Hamano2014-01-273-45/+124
|\ \ \ \ \ \ \ \
| * | | | | | | | interpret_branch_name: find all possible @-marksjk/interpret-branch-name-fixJeff King2014-01-152-9/+32
| * | | | | | | | interpret_branch_name: avoid @{upstream} past colonJeff King2014-01-152-0/+19
| * | | | | | | | interpret_branch_name: always respect "namelen" parameterJeff King2014-01-152-8/+24
| * | | | | | | | interpret_branch_name: rename "cp" variable to "at"Jeff King2014-01-151-5/+5
| * | | | | | | | interpret_branch_name: factor out upstream handlingJeff King2014-01-151-31/+52
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/allow-fetch-onelevel-refname'Junio C Hamano2014-01-272-1/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch-pack: do not filter out one-level refsjk/allow-fetch-onelevel-refnameJeff King2014-01-152-1/+12
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/revision-range-unpeel'Junio C Hamano2014-01-272-12/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | revision: propagate flag bits from tags to pointeesjc/revision-range-unpeelJunio C Hamano2014-01-152-6/+13
| * | | | | | | | revision: mark contents of an uninteresting tree uninterestingJunio C Hamano2014-01-152-8/+23
* | | | | | | | | Merge branch 'mh/retire-ref-fetch-rules'Junio C Hamano2014-01-273-10/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refname_match(): always use the rules in ref_rev_parse_rulesmh/retire-ref-fetch-rules@fooMichael Haggerty2014-01-143-10/+13
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mh/attr-macro-doc'Junio C Hamano2014-01-271-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitattributes: document more clearly where macros are allowedmh/attr-macro-docMichael Haggerty2014-01-141-3/+6
* | | | | | | | | | Merge branch 'jc/maint-pull-docfix'Junio C Hamano2014-01-272-5/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: "git pull" does not have the "-m" optionjc/maint-pull-docfixJunio C Hamano2014-01-141-3/+6
| * | | | | | | | | | Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfixJunio C Hamano2014-01-141-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Documentation: exclude irrelevant options from "git pull"jc/maint-pull-docfix-for-409b8d82Junio C Hamano2014-01-141-2/+2
* | | | | | | | | | | | Merge branch 'jk/complete-merge-base'Junio C Hamano2014-01-271-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | completion: handle --[no-]fork-point options to git-rebasejk/complete-merge-baseJohn Keeping2014-01-131-1/+1
| * | | | | | | | | | | | completion: complete merge-base optionsJohn Keeping2014-01-131-0/+6
* | | | | | | | | | | | | Merge branch 'ab/subtree-doc'Junio C Hamano2014-01-272-13/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | subtree: fix argument validation in add/pull/pushab/subtree-docAnthony Baire2014-01-132-13/+23
* | | | | | | | | | | | | | Makefile: Fix compilation of Windows resource fileJohannes Sixt2014-01-232-3/+3
* | | | | | | | | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2014-01-231-3/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-svn: memoize _rev_list and rebuildlin zuojian2014-01-231-3/+38
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2014-01-233-11/+1396
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | gitk: Indent word-wrapped lines in commit display headerPaul Mackerras2014-01-231-1/+1
| * | | | | | | | | | | | | | gitk: Comply with XDG base directory specificationAstril Hayato2014-01-221-5/+30
| * | | | | | | | | | | | | | gitk: Replace "next" and "prev" buttons with down and up arrowsMarc Branchaud2014-01-211-2/+28
| * | | | | | | | | | | | | | gitk: chmod +x po2msg.shJonathan Nieder2014-01-211-0/+0
| * | | | | | | | | | | | | | gitk: Update copyright datesPaul Mackerras2014-01-211-2/+2
| * | | | | | | | | | | | | | gitk: Add Bulgarian translation (304t)Alexander Shopov2014-01-211-0/+1334
| * | | | | | | | | | | | | | gitk: Fix mistypeMax Kirillov2014-01-211-1/+1
* | | | | | | | | | | | | | | Add cross-references between docs for for-each-ref and show-refMichael Haggerty2014-01-222-0/+5
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-guiJunio C Hamano2014-01-217-12/+3032
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-gui 0.19gitgui-0.19.0Pat Thoyts2014-01-181-1/+1