summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tc/fetch-leak'Junio C Hamano2011-10-171-4/+9
|\
| * fetch: plug two leaks on error exit in store_updated_refsTay Ray Chuan2011-10-071-4/+9
* | Merge branch 'jk/name-hash-dirent'Junio C Hamano2011-10-172-7/+9
|\ \
| * | fix phantom untracked files when core.ignorecase is setJeff King2011-10-072-7/+9
* | | Merge branch 'ef/mingw-syslog'Junio C Hamano2011-10-171-12/+18
|\ \ \
| * | | mingw: avoid using strbuf in syslogef/mingw-syslogErik Faye-Lund2011-10-071-12/+18
* | | | Merge branch 'tm/completion-push-set-upstream'Junio C Hamano2011-10-171-1/+1
|\ \ \ \
| * | | | completion: push --set-upstreamtm/completion-push-set-upstreamTeemu Matilainen2011-10-061-1/+1
* | | | | Merge branch 'tm/completion-commit-fixup-squash'Junio C Hamano2011-10-171-7/+4
|\ \ \ \ \
| * | | | | completion: commit --fixup and --squashtm/completion-commit-fixup-squashTeemu Matilainen2011-10-061-2/+3
| * | | | | completion: unite --reuse-message and --reedit-message handlingTeemu Matilainen2011-10-061-6/+2
| |/ / / /
* | | | | Merge branch 'ph/push-to-delete-nothing'Junio C Hamano2011-10-172-8/+215
|\ \ \ \ \
| * | | | | receive-pack: don't pass non-existent refs to post-{receive,update} hooksph/push-to-delete-nothingPang Yan Han2011-09-304-8/+211
* | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes'Junio C Hamano2011-10-172-1/+47
|\ \ \ \ \ \
| * | | | | | checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2011-09-302-1/+47
* | | | | | | Merge branch 'js/bisect-no-checkout'Junio C Hamano2011-10-171-1/+2
|\ \ \ \ \ \ \
| * | | | | | | bisect: fix exiting when checkout failed in bisect_start()Christian Couder2011-09-211-1/+2
* | | | | | | | resolve_gitlink_packed_ref(): fix mismergeJunio C Hamano2011-10-172-1/+30
* | | | | | | | Update draft release notes to 1.7.8Junio C Hamano2011-10-161-1/+3
* | | | | | | | Merge git://repo.or.cz/git-guiJunio C Hamano2011-10-169-29/+159
|\ \ \ \ \ \ \ \
| * | | | | | | | git-gui: incremental goto line in blame viewBert Wesarg2011-10-151-4/+11
| * | | | | | | | git-gui: clear the goto line input when hidingBert Wesarg2011-10-151-0/+1
| * | | | | | | | git-gui: only accept numbers in the goto-line inputBert Wesarg2011-10-151-2/+11
| * | | | | | | | git-gui: search and linenumber input are mutual exclusive in the blame viewBert Wesarg2011-10-151-6/+16
| * | | | | | | | git-gui: deal with unknown files when pressing the "Stage Changed" buttonHeiko Voigt2011-10-061-0/+9
| * | | | | | | | git-gui: drop the 'n' and 'Shift-n' bindings from the last patch.Pat Thoyts2011-07-191-2/+0
| * | | | | | | | git-gui: Add keyboard shortcuts for search and goto commands in blame view.David Fries2011-07-192-1/+7
| * | | | | | | | git-gui: Enable jumping to a specific line number in blame view.David Fries2011-07-192-0/+75
| * | | | | | | | Fix tooltip display with multiple monitors on windows.Pat Thoyts2011-07-112-4/+4
| * | | | | | | | Fix typo: existant->existentDmitry Ivankov2011-07-111-1/+1
| * | | | | | | | git-gui: updated translator README for current procedures.Pat Thoyts2011-07-111-20/+19
| * | | | | | | | git-gui: warn when trying to commit on a detached headHeiko Voigt2011-05-202-0/+16
| * | | | | | | | git-gui: Corrected a typo in the Swedish translation of 'Continue'Christoffer Pettersson2011-05-161-1/+1
* | | | | | | | | git-svn: Allow certain refs to be ignoredMichael Olson2011-10-161-5/+33
* | | | | | | | | git svn dcommit: new option --interactive.Frédéric Heitzmann2011-10-163-1/+146
* | | | | | | | | Sync with maintJunio C Hamano2011-10-152-41/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prepare for 1.7.7.1Junio C Hamano2011-10-152-1/+40
| * | | | | | | | | Merge branch 'ms/patch-id-with-overlong-line' into maintJunio C Hamano2011-10-151-4/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-bundle-too-quiet' into maintJunio C Hamano2011-10-154-5/+10
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-require-clean-work-tree' into maintJunio C Hamano2011-10-151-3/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-fsck-fwrite-size-check' into maintJunio C Hamano2011-10-151-6/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bk/ancestry-path' into maintJunio C Hamano2011-10-153-10/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-fetch-submodule-check-fix' into maintJunio C Hamano2011-10-151-5/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/mergetool-valgrind' into maintJunio C Hamano2011-10-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nm/grep-object-sha1-lock' into maintJunio C Hamano2011-10-151-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-index-unpack' into maintJunio C Hamano2011-10-155-6/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/rebase-i-exec-edit' into maintJunio C Hamano2011-10-152-4/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/grep-untracked-exclude'Junio C Hamano2011-10-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-excludeJunio C Hamano2011-10-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | grep: fix the error message that mentions --excludejc/maint-grep-untracked-excludeBert Wesarg2011-10-151-1/+1