summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Merge branch 'pt/git4win-mods' into puPat Thoyts2016-10-032-4/+11
| | |\ \ \ \ \
| | | * | | | | git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut`Pat Thoyts2016-10-031-4/+7
| | | * | | | | git-gui: fix detection of CygwinPat Thoyts2016-10-031-0/+4
| | | |/ / / /
| | * | | | | Merge branch 'patches' into puPat Thoyts2016-10-034-2/+10
| | |\ \ \ \ \
| | | * | | | | git-gui: ensure the file in the diff pane is in the list of selected filesAlex Riesen2016-10-031-0/+3
| | | * | | | | git-gui: support for $FILENAMES in tool definitionsAlex Riesen2016-10-031-0/+3
| | | * | | | | git-gui: fix initial git gui message encodingyaras2016-10-031-0/+2
| | | * | | | | git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command sub...Elia Pinto2016-10-031-2/+2
| | | |/ / / /
| | * | | | | Merge branch 'va/i18n' into puPat Thoyts2016-10-033-3/+3012
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'rs/use-modern-git-merge-syntax' into puPat Thoyts2016-10-031-6/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'js/commit-gpgsign' into puPat Thoyts2016-10-031-0/+3
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'sy/i18n' into puPat Thoyts2016-10-031-1309/+1438
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | git-gui: sort entries in tclIndexOlaf Hering2015-05-011-1/+1
* | | | | | | | | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-10-262-1/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-list: use hdr_termination instead of a always using a newlineJacob Keller2016-10-202-1/+15
* | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-10-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t3700: fix broken test under !SANITYtg/add-chmod+x-fixJunio C Hamano2016-10-201-0/+1
* | | | | | | | | | | | Merge branch 'bw/submodule-branch-dot-doc'Junio C Hamano2016-10-262-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | submodules doc: update documentation for "." used for submodule branchesbw/submodule-branch-dot-docBrandon Williams2016-10-192-3/+8
* | | | | | | | | | | | | Merge branch 'pb/test-parse-options-expect'Junio C Hamano2016-10-261-170/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t0040: convert all possible tests to use `test-parse-options --expect`pb/test-parse-options-expectPranit Bauva2016-10-171-170/+13
* | | | | | | | | | | | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-10-261-11/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | inline xalloc_flex() into FLEXPTR_ALLOC_MEMjk/tighten-allocRené Scharfe2016-10-171-9/+3
| * | | | | | | | | | | | | | avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEMRené Scharfe2016-10-171-2/+3
* | | | | | | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-10-266-50/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | i18n: diff: mark warnings for translationva/i18nVasco Almeida2016-10-171-7/+7
| * | | | | | | | | | | | | | | i18n: credential-cache--daemon: mark advice for translationVasco Almeida2016-10-171-3/+3
| * | | | | | | | | | | | | | | i18n: convert mark error messages for translationVasco Almeida2016-10-172-5/+13
| * | | | | | | | | | | | | | | i18n: apply: mark error message for translationVasco Almeida2016-10-172-3/+3
| * | | | | | | | | | | | | | | i18n: apply: mark error messages for translationVasco Almeida2016-10-141-24/+24
| * | | | | | | | | | | | | | | i18n: apply: mark info messages for translationVasco Almeida2016-10-141-4/+4
| * | | | | | | | | | | | | | | i18n: apply: mark plural string for translationVasco Almeida2016-10-141-4/+6
* | | | | | | | | | | | | | | | Merge branch 'jk/fetch-quick-tag-following'Junio C Hamano2016-10-264-4/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-followingJeff King2016-10-144-4/+112
* | | | | | | | | | | | | | | | | Merge branch 'jk/merge-base-fork-point-without-reflog'Junio C Hamano2016-10-262-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | merge-base: handle --fork-point without reflogjk/merge-base-fork-point-without-reflogJeff King2016-10-122-0/+9
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t1512: become resilient to GETTEXT_POISON buildjk/ambiguous-short-object-namesVasco Almeida2016-10-121-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'jk/upload-pack-use-prio-queue'Junio C Hamano2016-10-261-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | upload-pack: use priority queue in reachable() checkjk/upload-pack-use-prio-queueJeff King2016-10-111-6/+7
* | | | | | | | | | | | | | | | | | | Merge branch 'ab/gitweb-abbrev-links'Junio C Hamano2016-10-261-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | gitweb: link to "git describe"'d commits in log messagesab/gitweb-abbrev-linksÆvar Arnfjörð Bjarmason2016-10-141-2/+16
| * | | | | | | | | | | | | | | | | | | gitweb: link to 7-char+ SHA-1s, not only 8-char+Ævar Arnfjörð Bjarmason2016-10-141-1/+1
| * | | | | | | | | | | | | | | | | | | gitweb: fix a typo in a commentÆvar Arnfjörð Bjarmason2016-10-141-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok'Junio C Hamano2016-10-262-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | worktree: allow the main brach of a bare repository to be checked outdk/worktree-dup-checkout-with-bare-is-okDennis Kaarsemaker2016-10-142-0/+10
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/gpg-richer-status'Junio C Hamano2016-10-264-6/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | gpg-interface: use more status lettersmg/gpg-richer-statusMichael J Gruber2016-10-124-6/+34
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/cocci-xstrdup-or-null'Junio C Hamano2016-10-267-20/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | cocci: refactor common patterns to use xstrdup_or_null()jc/cocci-xstrdup-or-nullJunio C Hamano2016-10-127-20/+17
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |