summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bash: don't offer remote transport helpers as subcommandsSZEDER Gábor2010-01-281-0/+1
* Merge branch 'maint' of git://git.spearce.org/git-gui into maintJunio C Hamano2010-01-245-23/+48
|\
| * git-gui: work from the .git dirGiuseppe Bilotta2010-01-231-0/+10
| * git-gui: Fix applying a line when all following lines are deletionsJeff Epler2010-01-231-0/+1
| * git-gui: Correct file_states when unstaging partly staged entryJens Lehmann2010-01-231-0/+3
| * git-gui: Fix gitk for branch whose name matches local filePeter Krefting2010-01-231-1/+1
| * git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in syncChristopher Beelby2010-01-231-0/+4
| * git-gui: handle really long error messages in updateindex.Pat Thoyts2010-01-231-16/+18
| * git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"Vitaly _Vi Shukela2010-01-061-2/+8
| * git-gui: Makefile: consolidate .FORCE-* targetsJonathan Nieder2010-01-061-4/+3
* | ignore duplicated slashes in make_relative_path()Junio C Hamano2010-01-222-9/+36
* | merge-recursive: do not return NULL only to cause segfaultJunio C Hamano2010-01-211-4/+4
* | retry request without query when info/refs?query failsTay Ray Chuan2010-01-211-2/+16
* | Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maintJunio C Hamano2010-01-201-4/+6
|\ \
| * | status: don't require the repository to be writableJunio C Hamano2010-01-191-4/+6
* | | Git 1.6.6.1v1.6.6.1Junio C Hamano2010-01-203-8/+16
* | | Merge branch 'bg/maint-remote-update-default' into maintJunio C Hamano2010-01-202-6/+18
|\ \ \
| * | | Fix "git remote update" with remotes.defalt setBjörn Gustavsson2009-12-312-6/+18
* | | | Merge branch 'sb/maint-octopus' into maintJunio C Hamano2010-01-202-9/+57
|\ \ \ \
| * | | | octopus: remove dead codeStephen Boyd2009-12-131-5/+1
| * | | | octopus: reenable fast-forward mergesStephen Boyd2009-12-132-1/+19
| * | | | octopus: make merge process simpler to followStephen Boyd2009-12-132-4/+38
* | | | | Merge branch 'bg/maint-add-all-doc' into maintJunio C Hamano2010-01-202-29/+88
|\ \ \ \ \
| * | | | | git-rm doc: Describe how to sync index & work treeBjörn Gustavsson2010-01-071-1/+53
| * | | | | git-add/rm doc: Consistently back-quoteBjörn Gustavsson2009-12-072-15/+15
| * | | | | Documentation: 'git add -A' can remove filesBjörn Gustavsson2009-12-071-13/+20
* | | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-205-9/+40
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Git 1.6.5.8v1.6.5.8Junio C Hamano2010-01-204-3/+32
| * | | | | Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5Junio C Hamano2010-01-202-4/+8
| |\ \ \ \ \
| | * | | | | reset: unbreak hard resets with GIT_WORK_TREEJeff King2009-12-302-4/+8
| * | | | | | Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1...Junio C Hamano2010-01-201-4/+2
| |\ \ \ \ \ \
| | * | | | | | bash completion: factor submodules into dirty stateThomas Rast2009-12-311-4/+2
| * | | | | | | Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5Junio C Hamano2010-01-201-5/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5Junio C Hamano2010-01-201-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-01-188-43/+47
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-188-43/+47
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-188-43/+47
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano2010-01-181-1/+5
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix mis-backport of t7002Junio C Hamano2010-01-181-1/+5
* | | | | | | | | | | | | bisect: fix singular/plural grammar nitDavid Ripton2010-01-191-3/+5
* | | | | | | | | | | | | Update draft release notes to 1.6.6.1Junio C Hamano2010-01-181-1/+16
* | | | | | | | | | | | | Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maintJunio C Hamano2010-01-181-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | fast-import: tag may point to any object typeDmitry Potapov2010-01-141-5/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maintJunio C Hamano2010-01-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | grep: NUL terminate input from a fileJim Meyering2010-01-181-0/+1
* | | | | | | | | | | | Fix uninitialized variable in get_refs_via_rsync().Richard Weinberger2010-01-151-1/+1
* | | | | | | | | | | | Document git-blame triple -C optionRamkumar Ramachandra2010-01-142-3/+5
* | | | | | | | | | | | remote-curl: Fix Accept header for smart HTTP connectionsShawn O. Pearce2010-01-122-2/+2
* | | | | | | | | | | | grep: -L should show empty filesJunio C Hamano2010-01-121-2/+0
* | | | | | | | | | | | rebase--interactive: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-111-1/+1