summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bash prompt: indicate dirty index even on orphan branchessg/bash-prompt-dirty-orphanSZEDER Gábor2015-11-242-5/+4
* bash prompt: remove a redundant 'git diff' optionSZEDER Gábor2015-11-241-1/+1
* bash prompt: test dirty index and worktree while on an orphan branchSZEDER Gábor2015-11-241-3/+28
* Git 2.6.3v2.6.3Junio C Hamano2015-11-054-3/+115
* Merge branch 'rs/daemon-plug-child-leak' into maintJunio C Hamano2015-11-054-6/+18
|\
| * daemon: plug memory leakrs/daemon-plug-child-leakRené Scharfe2015-11-021-0/+1
| * run-command: factor out child_process_clear()René Scharfe2015-11-023-6/+17
* | Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano2015-11-052-35/+43
|\ \
| * | wt-status: use skip_prefix() to get rid of magic string length constantsrs/wt-status-detached-branch-fixRené Scharfe2015-11-011-21/+15
| * | wt-status: don't skip a magical number of characters blindlyRené Scharfe2015-11-011-1/+1
| * | wt-status: avoid building bogus branch name with detached HEADRené Scharfe2015-11-012-7/+10
| * | wt-status: exit early using goto in wt_shortstatus_print_tracking()René Scharfe2015-11-011-8/+5
| * | t7060: add test for status --branch on a detached HEADRené Scharfe2015-11-011-0/+14
* | | Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maintJunio C Hamano2015-11-051-1/+1
|\ \ \
| * | | add_submodule_odb: initialize alt_odb list earlierjk/initialization-fix-to-add-submodule-odbJeff King2015-10-281-1/+1
* | | | Merge branch 'js/misc-fixes' into maintJunio C Hamano2015-11-055-6/+12
|\ \ \ \
| * | | | Correct fscanf formatting string for I64u valuesjs/misc-fixesWaldek Maleska2015-10-262-1/+5
| * | | | Silence GCC's "cast of pointer to integer of a different size" warningJohannes Schindelin2015-10-263-4/+6
| * | | | Squelch warning about an integer overflowJohannes Schindelin2015-10-261-1/+1
* | | | | Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-053-7/+4
|\ \ \ \ \
| * | | | | add: simplify -u/-A without pathspecjc/add-u-A-default-to-topJunio C Hamano2015-10-243-7/+4
* | | | | | Merge branch 'jk/delete-modechange-conflict' into maintJunio C Hamano2015-11-055-89/+144
|\ \ \ \ \ \
| * | | | | | merge: detect delete/modechange conflictjk/delete-modechange-conflictJeff King2015-10-263-2/+37
| * | | | | | t6031: generalize for recursive and resolve strategiesJeff King2015-10-262-56/+77
| * | | | | | t6031: move triple-rename test to t3030Jeff King2015-10-262-31/+30
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/imap-send-curl-compilation-fix' into maintJunio C Hamano2015-11-051-0/+4
|\ \ \ \ \ \
| * | | | | | imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually availablejs/imap-send-curl-compilation-fixJohannes Schindelin2015-10-261-0/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'rp/link-curl-before-ssl' into maintJunio C Hamano2015-11-052-6/+34
|\ \ \ \ \ \
| * | | | | | configure.ac: detect ssl need with libcurlrp/link-curl-before-sslRemi Pommarel2015-10-211-0/+10
| * | | | | | Makefile: make curl-config path configurableRemi Pommarel2015-10-212-2/+19
| * | | | | | Makefile: link libcurl before zlibRemi Pommarel2015-10-211-4/+5
* | | | | | | Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-054-8/+66
|\ \ \ \ \ \ \
| * | | | | | | clone: better error when --reference is a linked checkoutnd/clone-linked-checkoutNguyễn Thái Ngọc Duy2015-09-281-1/+6
| * | | | | | | clone: allow --local from a linked checkoutNguyễn Thái Ngọc Duy2015-09-282-2/+9
| * | | | | | | enter_repo: allow .git files in strict modeNguyễn Thái Ngọc Duy2015-09-282-2/+17
| * | | | | | | enter_repo: avoid duplicating logic, use is_git_directory() insteadNguyễn Thái Ngọc Duy2015-09-282-2/+15
| * | | | | | | t0002: add test for enter_repo(), non-strict modeNguyễn Thái Ngọc Duy2015-09-281-0/+18
| * | | | | | | path.c: delete an extra spaceNguyễn Thái Ngọc Duy2015-09-071-1/+1
* | | | | | | | Merge branch 'sa/send-email-smtp-batch-data-limit' into maintJunio C Hamano2015-11-051-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | git-send-email.perl: Fixed sending of many/huge changes/patchessa/send-email-smtp-batch-data-limitStefan Agner2015-09-301-1/+5
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'xf/user-manual-ff' into maintJunio C Hamano2015-11-041-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | user-manual: fix the description of fast-forwardxf/user-manual-ffXue Fuqiao2015-10-261-5/+5
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'xf/user-manual-markup' into maintJunio C Hamano2015-11-0411-11/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: match undefline with the text in old release notesxf/user-manual-markupJunio C Hamano2015-10-225-5/+5
| * | | | | | | | Documentation: match underline with the textJunio C Hamano2015-10-225-5/+5
| * | | | | | | | Documentation: fix header markupXue Fuqiao2015-10-221-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/everyday-markup' into maintJunio C Hamano2015-11-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/everyday: match undefline with the textjc/everyday-markupJunio C Hamano2015-10-221-1/+1
* | | | | | | | | Merge branch 'jc/em-dash-in-doc' into maintJunio C Hamano2015-11-046-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: AsciiDoc spells em-dash as double-dashes, not triplejc/em-dash-in-docJunio C Hamano2015-10-226-6/+6
| | |_|/ / / / / / | |/| | | | | | |
View Lorry Controller Status