summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trastJunio C Hamano2010-01-243-80/+102
|\ \ \ \ \ \ \
| * | | | | | | Documentation: merge: use MERGE_HEAD to refer to the remote branchJonathan Nieder2010-01-241-6/+8
| * | | | | | | Documentation: simplify How Merge WorksJonathan Nieder2010-01-241-36/+16
| * | | | | | | Documentation: merge: add a section about fast-forwardJonathan Nieder2010-01-241-13/+18
| * | | | | | | Documentation: emphasize when git merge terminates earlyJonathan Nieder2010-01-241-10/+21
| * | | | | | | Documentation: merge: add an overviewJonathan Nieder2010-01-241-2/+26
| * | | | | | | Documentation: merge: move merge strategy list to endJonathan Nieder2010-01-241-2/+2
| * | | | | | | Documentation: suggest `reset --merge` in How Merge Works sectionJonathan Nieder2010-01-241-3/+3
| * | | | | | | Documentation: merge: move configuration section to endJonathan Nieder2010-01-241-9/+9
| * | | | | | | Documentation: emphasise 'git shortlog' in its synopsisThomas Rast2010-01-101-1/+1
| * | | | | | | Documentation: show-files is now called git-ls-filesThomas Rast2010-01-101-1/+1
| * | | | | | | Documentation: tiny git config manual tweaksJonathan Nieder2010-01-101-4/+4
| * | | | | | | Documentation: git gc packs refs by default nowJonathan Nieder2010-01-101-9/+6
* | | | | | | | pull: re-fix command line generationJunio C Hamano2010-01-242-1/+36
| |_|_|_|/ / / |/| | | | | |
* | | | | | | rebase -i: Export GIT_AUTHOR_* variables explicitlyJunio C Hamano2010-01-241-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-231-0/+12
|/ / / / / / /
* | | | | | | msvc: Add a definition of NORETURN compatible with msvc compilerRamsay Jones2010-01-231-0/+3
* | | | | | | Update draft release notes to 1.7.0Junio C Hamano2010-01-231-1/+26
* | | | | | | msvc: Fix a compiler warning due to an incorrect pointer castRamsay Jones2010-01-231-1/+1
* | | | | | | msvc: Fix an "unrecognized option" linker warningRamsay Jones2010-01-232-0/+2
* | | | | | | Merge branch 'maint'Junio C Hamano2010-01-232-9/+36
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | ignore duplicated slashes in make_relative_path()Junio C Hamano2010-01-232-9/+36
* | | | | | | Merge branch 'jc/branch-d'Junio C Hamano2010-01-232-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-239-19/+357
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: improve description of --glob=pattern and friendsThomas Rast2010-01-221-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-233-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-2314-52/+279
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Performance optimization for detection of modified submodulesJens Lehmann2010-01-196-29/+56
| * | | | | | | | | git status: Show uncommitted submodule changes too when enabledJens Lehmann2010-01-184-9/+15
| * | | | | | | | | Teach diff that modified submodule directory is dirtyJunio C Hamano2010-01-172-3/+90
| * | | | | | | | | Show submodules as modified when they contain a dirty work treeJens Lehmann2010-01-174-17/+124
* | | | | | | | | | Merge branch 'il/remote-updates'Junio C Hamano2010-01-233-1/+330
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add git remote set-urlIlari Liusvaara2010-01-193-1/+330