Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tc/fetch-leak' | Junio C Hamano | 2011-10-17 | 1 | -4/+9 |
|\ | |||||
| * | fetch: plug two leaks on error exit in store_updated_refs | Tay Ray Chuan | 2011-10-07 | 1 | -4/+9 |
* | | Merge branch 'jk/name-hash-dirent' | Junio C Hamano | 2011-10-17 | 2 | -7/+9 |
|\ \ | |||||
| * | | fix phantom untracked files when core.ignorecase is set | Jeff King | 2011-10-07 | 2 | -7/+9 |
* | | | Merge branch 'ef/mingw-syslog' | Junio C Hamano | 2011-10-17 | 1 | -12/+18 |
|\ \ \ | |||||
| * | | | mingw: avoid using strbuf in syslogef/mingw-syslog | Erik Faye-Lund | 2011-10-07 | 1 | -12/+18 |
* | | | | Merge branch 'tm/completion-push-set-upstream' | Junio C Hamano | 2011-10-17 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | completion: push --set-upstreamtm/completion-push-set-upstream | Teemu Matilainen | 2011-10-06 | 1 | -1/+1 |
* | | | | | Merge branch 'tm/completion-commit-fixup-squash' | Junio C Hamano | 2011-10-17 | 1 | -7/+4 |
|\ \ \ \ \ | |||||
| * | | | | | completion: commit --fixup and --squashtm/completion-commit-fixup-squash | Teemu Matilainen | 2011-10-06 | 1 | -2/+3 |
| * | | | | | completion: unite --reuse-message and --reedit-message handling | Teemu Matilainen | 2011-10-06 | 1 | -6/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'ph/push-to-delete-nothing' | Junio C Hamano | 2011-10-17 | 2 | -8/+215 |
|\ \ \ \ \ | |||||
| * | | | | | receive-pack: don't pass non-existent refs to post-{receive,update} hooksph/push-to-delete-nothing | Pang Yan Han | 2011-09-30 | 4 | -8/+211 |
* | | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes' | Junio C Hamano | 2011-10-17 | 2 | -1/+47 |
|\ \ \ \ \ \ | |||||
| * | | | | | | checkout $tree $path: do not clobber local changes in $path not in $tree | Junio C Hamano | 2011-09-30 | 2 | -1/+47 |
* | | | | | | | Merge branch 'js/bisect-no-checkout' | Junio C Hamano | 2011-10-17 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | bisect: fix exiting when checkout failed in bisect_start() | Christian Couder | 2011-09-21 | 1 | -1/+2 |
* | | | | | | | | resolve_gitlink_packed_ref(): fix mismerge | Junio C Hamano | 2011-10-17 | 2 | -1/+30 |
* | | | | | | | | Update draft release notes to 1.7.8 | Junio C Hamano | 2011-10-16 | 1 | -1/+3 |
* | | | | | | | | Merge git://repo.or.cz/git-gui | Junio C Hamano | 2011-10-16 | 9 | -29/+159 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-gui: incremental goto line in blame view | Bert Wesarg | 2011-10-15 | 1 | -4/+11 |
| * | | | | | | | | git-gui: clear the goto line input when hiding | Bert Wesarg | 2011-10-15 | 1 | -0/+1 |
| * | | | | | | | | git-gui: only accept numbers in the goto-line input | Bert Wesarg | 2011-10-15 | 1 | -2/+11 |
| * | | | | | | | | git-gui: search and linenumber input are mutual exclusive in the blame view | Bert Wesarg | 2011-10-15 | 1 | -6/+16 |
| * | | | | | | | | git-gui: deal with unknown files when pressing the "Stage Changed" button | Heiko Voigt | 2011-10-06 | 1 | -0/+9 |
| * | | | | | | | | git-gui: drop the 'n' and 'Shift-n' bindings from the last patch. | Pat Thoyts | 2011-07-19 | 1 | -2/+0 |
| * | | | | | | | | git-gui: Add keyboard shortcuts for search and goto commands in blame view. | David Fries | 2011-07-19 | 2 | -1/+7 |
| * | | | | | | | | git-gui: Enable jumping to a specific line number in blame view. | David Fries | 2011-07-19 | 2 | -0/+75 |
| * | | | | | | | | Fix tooltip display with multiple monitors on windows. | Pat Thoyts | 2011-07-11 | 2 | -4/+4 |
| * | | | | | | | | Fix typo: existant->existent | Dmitry Ivankov | 2011-07-11 | 1 | -1/+1 |
| * | | | | | | | | git-gui: updated translator README for current procedures. | Pat Thoyts | 2011-07-11 | 1 | -20/+19 |
| * | | | | | | | | git-gui: warn when trying to commit on a detached head | Heiko Voigt | 2011-05-20 | 2 | -0/+16 |
| * | | | | | | | | git-gui: Corrected a typo in the Swedish translation of 'Continue' | Christoffer Pettersson | 2011-05-16 | 1 | -1/+1 |
* | | | | | | | | | git-svn: Allow certain refs to be ignored | Michael Olson | 2011-10-16 | 1 | -5/+33 |
* | | | | | | | | | git svn dcommit: new option --interactive. | Frédéric Heitzmann | 2011-10-16 | 3 | -1/+146 |
* | | | | | | | | | Sync with maint | Junio C Hamano | 2011-10-15 | 2 | -41/+39 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Prepare for 1.7.7.1 | Junio C Hamano | 2011-10-15 | 2 | -1/+40 |
| * | | | | | | | | | Merge branch 'ms/patch-id-with-overlong-line' into maint | Junio C Hamano | 2011-10-15 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-bundle-too-quiet' into maint | Junio C Hamano | 2011-10-15 | 4 | -5/+10 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/filter-branch-require-clean-work-tree' into maint | Junio C Hamano | 2011-10-15 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-fsck-fwrite-size-check' into maint | Junio C Hamano | 2011-10-15 | 1 | -6/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bk/ancestry-path' into maint | Junio C Hamano | 2011-10-15 | 3 | -10/+101 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-fetch-submodule-check-fix' into maint | Junio C Hamano | 2011-10-15 | 1 | -5/+72 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/mergetool-valgrind' into maint | Junio C Hamano | 2011-10-15 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nm/grep-object-sha1-lock' into maint | Junio C Hamano | 2011-10-15 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-index-unpack' into maint | Junio C Hamano | 2011-10-15 | 5 | -6/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/rebase-i-exec-edit' into maint | Junio C Hamano | 2011-10-15 | 2 | -4/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/grep-untracked-exclude' | Junio C Hamano | 2011-10-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude | Junio C Hamano | 2011-10-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | grep: fix the error message that mentions --excludejc/maint-grep-untracked-exclude | Bert Wesarg | 2011-10-15 | 1 | -1/+1 |