summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/wt-status-detached-branch-fix'Junio C Hamano2015-11-032-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 'rs/show-branch-argv-array'Junio C Hamano2015-11-031-16/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-branch: use argv_array for default argumentsrs/show-branch-argv-arrayRené Scharfe2015-11-011-16/+8
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/git-gdb'Junio C Hamano2015-11-033-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test: facilitate debugging Git executables in tests with gdbjs/git-gdbJohannes Schindelin2015-10-303-1/+20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/initialization-fix-to-add-submodule-odb'Junio C Hamano2015-11-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add_submodule_odb: initialize alt_odb list earlierjk/initialization-fix-to-add-submodule-odbJeff King2015-10-281-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2015-11-032-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: ignore symbolic links in use_wt_fileDavid Aguilar2015-10-292-3/+20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/mailinfo-lib'Junio C Hamano2015-11-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mailinfo: fix passing wrong address to git_mailinfo_configjc/mailinfo-libNguyễn Thái Ngọc Duy2015-11-011-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kn/for-each-branch'Junio C Hamano2015-11-032-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref-filter: fallback on alphabetical comparisonkn/for-each-branchKarthik Nayak2015-10-302-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninth batch for 2.7Junio C Hamano2015-10-301-2/+31
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code'Junio C Hamano2015-10-303-1/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-file: clamp exit code to maximum 127jk/merge-file-exit-codeJeff King2015-10-293-1/+38
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-10-302-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase-i: work around Windows CRLF line endingsgr/rebase-i-drop-warnJunio C Hamano2015-10-282-1/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsJohannes Schindelin2015-10-281-0/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'xf/user-manual-ff'Junio C Hamano2015-10-301-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user-manual: fix the description of fast-forwardxf/user-manual-ffXue Fuqiao2015-10-261-5/+5
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/pop-commit'Junio C Hamano2015-10-3010-92/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use pop_commit() for consuming the first entry of a struct commit_listrs/pop-commitRené Scharfe2015-10-2610-92/+31
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-error-message'Junio C Hamano2015-10-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blame: fix option name in error messagemk/blame-error-messageMax Kirillov2015-10-261-1/+1
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/misc-fixes'Junio C Hamano2015-10-305-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 'js/imap-send-curl-compilation-fix'Junio C Hamano2015-10-301-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 'jk/delete-modechange-conflict'Junio C Hamano2015-10-305-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 'jc/add-u-A-default-to-top'Junio C Hamano2015-10-303-7/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add: simplify -u/-A without pathspecjc/add-u-A-default-to-topJunio C Hamano2015-10-243-7/+4
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ar/clone-dissociate'Junio C Hamano2015-10-303-10/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: allow "--dissociate" without referencear/clone-dissociateAlex Riesen2015-10-223-10/+26
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2015-10-3013-531/+450
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/vnwildman/gitkPaul Mackerras2015-10-301-22/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Vietnamese translationTrần Ngọc Quân2015-09-151-22/+23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitk: Update Russian translationDimitriy Ryazantcev2015-10-301-239/+160
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitk: Add accelerator to German localeTakashi Iwai2015-10-301-18/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitk: Add accelerators to Japanese localeTakashi Iwai2015-10-301-17/+17