aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blame: test to describe use of blame --reverse --first-parentMax Kirillov2015-10-30
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/wt-status-detached-branch-fix'Junio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status: use skip_prefix() to get rid of magic string length constantsRené Scharfe2015-11-01
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status: don't skip a magical number of characters blindlyRené Scharfe2015-11-01
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status: avoid building bogus branch name with detached HEADRené Scharfe2015-11-01
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status: exit early using goto in wt_shortstatus_print_tracking()René Scharfe2015-11-01
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7060: add test for status --branch on a detached HEADRené Scharfe2015-11-01
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/show-branch-argv-array'Junio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-branch: use argv_array for default argumentsRené Scharfe2015-11-01
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/git-gdb'Junio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test: facilitate debugging Git executables in tests with gdbJohannes Schindelin2015-10-30
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/initialization-fix-to-add-submodule-odb'Junio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add_submodule_odb: initialize alt_odb list earlierJeff King2015-10-28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: ignore symbolic links in use_wt_fileDavid Aguilar2015-10-29
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/mailinfo-lib'Junio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mailinfo: fix passing wrong address to git_mailinfo_configNguyễn Thái Ngọc Duy2015-11-01
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kn/for-each-branch'Junio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref-filter: fallback on alphabetical comparisonKarthik Nayak2015-10-30
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninth batch for 2.7Junio C Hamano2015-10-30
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-file: clamp exit code to maximum 127Jeff King2015-10-29
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase-i: work around Windows CRLF line endingsJunio C Hamano2015-10-28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsJohannes Schindelin2015-10-28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'xf/user-manual-ff'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user-manual: fix the description of fast-forwardXue Fuqiao2015-10-26
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/pop-commit'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use pop_commit() for consuming the first entry of a struct commit_listRené Scharfe2015-10-26
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-error-message'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blame: fix option name in error messageMax Kirillov2015-10-26
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/misc-fixes'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct fscanf formatting string for I64u valuesWaldek Maleska2015-10-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silence GCC's "cast of pointer to integer of a different size" warningJohannes Schindelin2015-10-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squelch warning about an integer overflowJohannes Schindelin2015-10-26
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/imap-send-curl-compilation-fix'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually availableJohannes Schindelin2015-10-26
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/delete-modechange-conflict'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge: detect delete/modechange conflictJeff King2015-10-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t6031: generalize for recursive and resolve strategiesJeff King2015-10-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t6031: move triple-rename test to t3030Jeff King2015-10-26
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/add-u-A-default-to-top'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add: simplify -u/-A without pathspecJunio C Hamano2015-10-24
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ar/clone-dissociate'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: allow "--dissociate" without referenceAlex Riesen2015-10-22
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/vnwildman/gitkPaul Mackerras2015-10-30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Vietnamese translationTrần Ngọc Quân2015-09-15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitk: Update Russian translationDimitriy Ryazantcev2015-10-30
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitk: Add accelerator to German localeTakashi Iwai2015-10-30