summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pull: re-fix command line generationJunio C Hamano2010-01-242-1/+36
* rebase -i: Export GIT_AUTHOR_* variables explicitlyJunio C Hamano2010-01-231-4/+4
* Documentation: rev-list: fix synopsys for --tags and and --remotesChristian Couder2010-01-231-2/+2
* Merge git://git.bogomips.org/git-svnJunio C Hamano2010-01-239-162/+1018
|\
| * git-svn: allow subset of branches/tags to be specified in glob specJay Soffian2010-01-234-20/+320
| * git-svn: allow UUID to be manually remapped via rewriteUUIDJay Soffian2010-01-234-8/+140
| * git-svn: update svn mergeinfo test suiteAndrew Myrick2010-01-233-127/+485
| * git-svn: document --username/commit-url for branch/tagIgor Mironov2010-01-231-0/+13
| * git-svn: add --username/commit-url options for branch/tagIgor Mironov2010-01-231-2/+6
| * git-svn: respect commiturl option for branch/tagIgor Mironov2010-01-231-1/+11
| * git-svn: fix mismatched src/dst errors for branch/tagIgor Mironov2010-01-231-0/+4
| * git-svn: handle merge-base failuresAndrew Myrick2010-01-231-4/+15
| * git-svn: ignore changeless commits when checking for a cherry-pickAndrew Myrick2010-01-231-0/+24
* | t7800-difftool.sh: Test mergetool.prompt fallbackDavid Aguilar2010-01-221-0/+12
|/
* msvc: Add a definition of NORETURN compatible with msvc compilerRamsay Jones2010-01-221-0/+3
* Update draft release notes to 1.7.0Junio C Hamano2010-01-221-1/+26
* msvc: Fix a compiler warning due to an incorrect pointer castRamsay Jones2010-01-221-1/+1
* msvc: Fix an "unrecognized option" linker warningRamsay Jones2010-01-222-0/+2
* Merge branch 'maint'Junio C Hamano2010-01-222-9/+36
|\
| * ignore duplicated slashes in make_relative_path()Junio C Hamano2010-01-222-9/+36
* | Merge branch 'jc/branch-d'Junio C Hamano2010-01-222-10/+80
|\ \
| * | branch -d: base the "already-merged" safety on the branch it merges withJunio C Hamano2009-12-302-10/+80
* | | Merge branch 'il/rev-glob'Junio C Hamano2010-01-229-19/+357
|\ \ \
| * | | Documentation: improve description of --glob=pattern and friendsThomas Rast2010-01-211-17/+15
| * | | rev-parse --branches/--tags/--remotes=patternIlari Liusvaara2010-01-209-20/+139
| * | | rev-parse --globIlari Liusvaara2010-01-209-2/+223
* | | | Merge branch 'js/refer-upstream'Junio C Hamano2010-01-223-13/+192
|\ \ \ \
| * | | | Teach @{upstream} syntax to strbuf_branchanme()Junio C Hamano2010-01-202-45/+77
| * | | | t1506: more test for @{upstream} syntaxJunio C Hamano2010-01-201-0/+41
| * | | | Introduce <branch>@{upstream} notationJohannes Schindelin2010-01-123-3/+109
* | | | | Merge branch 'jl/submodule-diff'Junio C Hamano2010-01-2214-52/+279
|\ \ \ \ \
| * | | | | Performance optimization for detection of modified submodulesJens Lehmann2010-01-186-29/+56
| * | | | | git status: Show uncommitted submodule changes too when enabledJens Lehmann2010-01-174-9/+15
| * | | | | Teach diff that modified submodule directory is dirtyJunio C Hamano2010-01-162-3/+90
| * | | | | Show submodules as modified when they contain a dirty work treeJens Lehmann2010-01-164-17/+124
* | | | | | Merge branch 'il/remote-updates'Junio C Hamano2010-01-223-1/+330
|\ \ \ \ \ \
| * | | | | | Add git remote set-urlIlari Liusvaara2010-01-183-1/+330
* | | | | | | Merge branch 'il/branch-set-upstream'Junio C Hamano2010-01-225-13/+64
|\ \ \ \ \ \ \
| * | | | | | | branch: warn and refuse to set a branch as a tracking branch of itself.Matthieu Moy2010-01-181-2/+12
| * | | | | | | Add branch --set-upstreamIlari Liusvaara2010-01-185-11/+52
| |/ / / / / /
* | | | | | | Merge branch 'jc/maint-limit-note-output'Junio C Hamano2010-01-228-1/+85
|\ \ \ \ \ \ \
| * | | | | | | Fix "log --oneline" not to show notesJunio C Hamano2010-01-213-4/+7
| * | | | | | | Fix "log" family not to be too agressive about showing notesJunio C Hamano2010-01-208-1/+82
* | | | | | | | Merge branch 'nd/ls-files-sparse-fix'Junio C Hamano2010-01-221-3/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix memory corruption when .gitignore does not end by \nNguyễn Thái Ngọc Duy2010-01-201-3/+13
* | | | | | | | | Make difftool.prompt fall back to mergetool.promptSebastian Schuberth2010-01-221-1/+2
* | | | | | | | | engine.pl: Fix a recent breakage of the buildsystem generatorRamsay Jones2010-01-221-3/+5
* | | | | | | | | git-mv: fix moving more than one source to a single destinationJunio C Hamano2010-01-222-4/+19
* | | | | | | | | rebase -i: Enclose sed command substitution in quotesMichael Haggerty2010-01-221-1/+1
* | | | | | | | | rebase -i: Avoid non-portable "test X -a Y"Michael Haggerty2010-01-221-1/+1
View Lorry Controller Status