summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config: complain about --local outside of a git repojk/no-looking-at-dotgit-outside-repoJeff King2017-05-151-0/+3
* test-read-cache: setup git dirRené Scharfe2017-04-161-0/+1
* has_sha1_file: don't bother if we are not in a repositoryJonathan Nieder2017-04-131-0/+2
* sha1_name: make wraparound of the index into ring-buffer explicitRené Scharfe2016-11-011-1/+2
* diff: handle sha1 abbreviations outside of repositoryJeff King2016-10-261-4/+17
* diff_aligned_abbrev: use "struct oid"Jeff King2016-10-263-12/+14
* diff_unique_abbrev: rename to diff_aligned_abbrevJeff King2016-10-263-11/+11
* find_unique_abbrev: use 4-buffer ringJeff King2016-10-264-19/+16
* test-*-cache-tree: setup git dirJeff King2016-10-262-0/+2
* read info/{attributes,exclude} only when in repositoryJeff King2016-10-262-7/+11
* Eleventh batch for 2.11Junio C Hamano2016-10-261-0/+106
* Merge branch 'ex/deprecate-empty-pathspec-as-match-all'Junio C Hamano2016-10-263-2/+19
|\
| * pathspec: warn on empty strings as pathspecEmily Xie2016-06-223-2/+19
* | Merge branch 'po/fix-doc-merge-base-illustration'Junio C Hamano2016-10-262-21/+21
|\ \
| * | doc: fix the 'revert a faulty merge' ASCII art tab spacingpo/fix-doc-merge-base-illustrationPhilip Oakley2016-10-241-8/+8
| * | doc: fix merge-base ASCII art tab spacingPhilip Oakley2016-10-211-13/+13
* | | Merge branch 'jk/tap-verbose-fix'Junio C Hamano2016-10-263-5/+37
|\ \ \
| * | | test-lib: bail out when "-v" used under "prove"jk/tap-verbose-fixJeff King2016-10-241-0/+10
| * | | travis: use --verbose-log test optionJeff King2016-10-211-1/+1
| * | | test-lib: add --verbose-log optionJeff King2016-10-212-3/+25
| * | | test-lib: handle TEST_OUTPUT_DIRECTORY with spacesJeff King2016-10-211-2/+2
| |/ /
* | | Merge branch 'mm/send-email-cc-cruft-after-address'Junio C Hamano2016-10-263-10/+42
|\ \ \
| * | | Git.pm: add comment pointing to t9000mm/send-email-cc-cruft-after-addressMatthieu Moy2016-10-211-0/+2
| * | | t9000-addresses: update expected results after fixMatthieu Moy2016-10-211-4/+4
| * | | parse_mailboxes: accept extra text after <...> addressMatthieu Moy2016-10-142-6/+36
* | | | Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc'Junio C Hamano2016-10-261-3/+2
|\ \ \ \
| * | | | doc: remove reference to the traditional layout in git-tag.txtyk/git-tag-remove-mention-of-old-layout-in-docYounes Khoudli2016-10-201-3/+2
| | |/ / | |/| |
* | | | Merge branch 'pt/gitgui-updates'Junio C Hamano2016-10-2626-1923/+1982
|\ \ \ \
| * \ \ \ Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-guipt/gitgui-updatesJunio C Hamano2016-10-2026-1923/+1982
| |\ \ \ \
| | * | | | git-gui: set version 0.21gitgui-0.21.0Pat Thoyts2016-10-201-1/+1
| | * | | | Merge branch 'as/bulgarian' into puPat Thoyts2016-10-202-1374/+1467
| | |\ \ \ \
| | | * | | | git-gui: Mark 'All' in remote.tcl for translationAlexander Shopov2016-10-201-4/+4
| | | * | | | git-gui i18n: Updated Bulgarian translation (565,0f,0u)Alexander Shopov2016-10-201-1370/+1463
| | * | | | | Merge branch 'os/preserve-author' into puPat Thoyts2016-10-201-3/+33
| | |\ \ \ \ \
| | | * | | | | git-gui: avoid persisting modified author identityPat Thoyts2016-10-061-20/+31
| | | * | | | | git-gui: Do not reset author details on amendOrgad Shaneh2016-04-141-0/+19
| | * | | | | | Merge branch 'kb/unicode' into puPat Thoyts2016-10-203-30/+12
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | git-gui: handle the encoding of Git's output correctlyKarsten Blees2016-10-061-25/+4
| | | * | | | | git-gui: unicode file name support on windowsKarsten Blees2016-10-063-8/+11
| | |/ / / / /
| | * | | | | Merge branch 'dr/ru' into puPat Thoyts2016-10-041-431/+249
| | |\ \ \ \ \
| | | * | | | | git-gui: Update Russian translationDimitriy Ryazantcev2016-10-041-431/+249
| | | |/ / / /
| | * | | | | git-gui: maintain backwards compatibility for merge syntaxPat Thoyts2016-10-041-1/+10
| | * | | | | Merge branch 'va/i18n_2' into puPat Thoyts2016-10-0317-36/+35
| | |\ \ \ \ \
| | | * | | | | git-gui i18n: mark string in lib/error.tcl for translationVasco Almeida2016-10-031-1/+1
| | | * | | | | git-gui: fix incorrect use of Tcl append commandVasco Almeida2016-10-0315-26/+25
| | | * | | | | git-gui i18n: mark "usage:" strings for translationVasco Almeida2016-10-031-2/+2
| | | * | | | | git-gui i18n: internationalize use of colon punctuationVasco Almeida2016-10-034-7/+7
| | |/ / / / /
| | * | | | | Merge branch 'pt/non-mouse-usage' into puPat Thoyts2016-10-032-42/+155
| | |\ \ \ \ \
| | | * | | | | Amend tab ordering and text widget border and highlighting.Pat Thoyts2016-10-022-31/+124
| | | * | | | | Allow keyboard control to work in the staging widgets.Pat Thoyts2016-10-011-12/+32
| | | |/ / / /
View Lorry Controller Status