| Commit message (Expand) | Author | Age | Files | Lines |
* | t6023-merge-file: Work around non-portable sed usage | Arjen Laarhoven | 2008-09-08 | 1 | -2/+2 |
* | Correct output of git-count-objects. | Mikael Magnusson | 2008-09-08 | 1 | -1/+1 |
* | Windows: git-shell can be compiled again | Johannes Sixt | 2008-09-08 | 1 | -1/+1 |
* | t/t91XX git-svn tests: run "git svn" not "git-svn" | Nanako Shiraishi | 2008-09-08 | 27 | -174/+174 |
* | t/t91XX-svn: start removing use of "git-" from these tests | Nanako Shiraishi | 2008-09-08 | 10 | -55/+58 |
* | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2008-09-08 | 2 | -0/+17 |
|\ |
|
| * | git-svn: fix handling of even funkier branch names | Eric Wong | 2008-09-06 | 2 | -0/+17 |
* | | Merge branch 'ar/autospell' | Junio C Hamano | 2008-09-07 | 8 | -4/+159 |
|\ \ |
|
| * | | Add help.autocorrect to enable/disable autocorrecting | Alex Riesen | 2008-08-31 | 2 | -1/+27 |
| * | | git wrapper: DWIM mistyped commands | Johannes Schindelin | 2008-08-31 | 7 | -4/+133 |
* | | | Merge branch 'jc/cc-ld-dynpath' | Junio C Hamano | 2008-09-07 | 3 | -8/+42 |
|\ \ \ |
|
| * | | | configure: auto detect dynamic library path switches | Giovanni Funchal | 2008-08-17 | 2 | -0/+33 |
| * | | | Makefile: Allow CC_LD_DYNPATH to be overriden | Junio C Hamano | 2008-08-17 | 1 | -8/+9 |
* | | | | Merge branch 'jc/hide-cr-in-diff-from-less' | Junio C Hamano | 2008-09-07 | 3 | -3/+34 |
|\ \ \ \ |
|
| * | | | | diff: Help "less" hide ^M from the output | Junio C Hamano | 2008-08-30 | 3 | -3/+34 |
* | | | | | Merge branch 'jc/maint-checkout-fix' | Junio C Hamano | 2008-09-07 | 2 | -1/+50 |
|\ \ \ \ \ |
|
| * | | | | | checkout: do not check out unmerged higher stages randomly | Junio C Hamano | 2008-08-30 | 2 | -1/+50 |
* | | | | | | Teach "git diff -p" to locate PHP class methods | Andreas Ericsson | 2008-09-07 | 2 | -2/+5 |
* | | | | | | Update draft release notes for 1.6.1 | Junio C Hamano | 2008-09-06 | 1 | -2/+7 |
* | | | | | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2008-09-06 | 3 | -119/+164 |
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | git-svn: set auto_props when renaming files | Paul Talacko | 2008-09-06 | 2 | -0/+18 |
| * | | | | | t9124: clean up chdir usage | Eric Wong | 2008-09-06 | 1 | -4/+2 |
| * | | | | | git-svn: fix 'info' tests for unknown items | Thomas Rast | 2008-09-05 | 1 | -48/+25 |
| * | | | | | git-svn: match SVN 1.5 behaviour of info' on unknown item | Thomas Rast | 2008-09-05 | 1 | -2/+2 |
| * | | | | | git svn info: always quote URLs in 'info' output | Thomas Rast | 2008-09-05 | 2 | -17/+38 |
| * | | | | | git svn info: make info relative to the current directory | Thomas Rast | 2008-09-05 | 2 | -3/+16 |
| * | | | | | git svn info: tests: fix ptouch argument order in setup | Thomas Rast | 2008-09-05 | 1 | -4/+4 |
| * | | | | | git svn info: tests: use test_cmp instead of git-diff | Thomas Rast | 2008-09-05 | 1 | -22/+22 |
| * | | | | | git svn info: tests: do not use set -e | Thomas Rast | 2008-09-05 | 1 | -2/+0 |
| * | | | | | git svn info: tests: let 'init' test run with SVN 1.5 | Thomas Rast | 2008-09-05 | 1 | -2/+2 |
| * | | | | | git svn: catch lack of upstream info for dcommit earlier | Thomas Rast | 2008-09-05 | 1 | -4/+4 |
| * | | | | | git-svn: check error code of send_txstream | Eric Wong | 2008-09-05 | 1 | -1/+5 |
| * | | | | | git-svn: Send deltas during commits | Florian Weimer | 2008-09-05 | 1 | -5/+13 |
| * | | | | | git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob | Florian Weimer | 2008-09-05 | 1 | -12/+19 |
| * | | | | | git-svn: extract base blob in generate_diff | Florian Weimer | 2008-09-05 | 1 | -3/+4 |
| | | | | | | |
| \ \ \ \ \ | |
*-. \ \ \ \ \ | Merge updated git-gui and gitk that call each other | Junio C Hamano | 2008-09-06 | 9 | -120/+943 |
|\ \ \ \ \ \ \ |
|
| | * | | | | | | gitk: Add menu item for calling git gui blame | Alexander Gavrilov | 2008-08-26 | 1 | -0/+23 |
| | * | | | | | | gitk: Add option to specify the default commit on command line | Alexander Gavrilov | 2008-08-26 | 1 | -1/+20 |
| * | | | | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-09-04 | 1 | -7/+11 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | git-gui: Show special diffs for complex conflict cases. | Alexander Gavrilov | 2008-09-04 | 1 | -5/+89 |
| * | | | | | | | | git-gui: Make F5 reselect a diff, if an untracked file is selected. | Alexander Gavrilov | 2008-09-04 | 1 | -9/+35 |
| * | | | | | | | | git-gui: Reimplement and enhance auto-selection of diffs. | Alexander Gavrilov | 2008-09-04 | 3 | -39/+109 |
| * | | | | | | | | git-gui: Support conflict states _U & UT. | Alexander Gavrilov | 2008-09-04 | 4 | -3/+7 |
| * | | | | | | | | git-gui: Support more merge tools. | Alexander Gavrilov | 2008-09-04 | 1 | -0/+27 |
| * | | | | | | | | git-gui: Don't allow staging files with conflicts. | Alexander Gavrilov | 2008-09-04 | 1 | -0/+8 |
| * | | | | | | | | git-gui: Support calling merge tools. | Alexander Gavrilov | 2008-09-04 | 3 | -0/+260 |
| * | | | | | | | | git-gui: Support resolving conflicts via the diff context menu. | Alexander Gavrilov | 2008-09-04 | 2 | -60/+190 |
| * | | | | | | | | git-gui: Mark forgotten strings for translation. | Christian Stimming | 2008-09-04 | 1 | -2/+2 |
| * | | | | | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-09-01 | 4 | -5/+5 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | git-gui: Allow specifying an initial line for git gui blame. | Alexander Gavrilov | 2008-08-24 | 3 | -5/+14 |