Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast | Junio C Hamano | 2010-01-24 | 3 | -80/+102 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Documentation: merge: use MERGE_HEAD to refer to the remote branch | Jonathan Nieder | 2010-01-24 | 1 | -6/+8 | |
| * | | | | | | | Documentation: simplify How Merge Works | Jonathan Nieder | 2010-01-24 | 1 | -36/+16 | |
| * | | | | | | | Documentation: merge: add a section about fast-forward | Jonathan Nieder | 2010-01-24 | 1 | -13/+18 | |
| * | | | | | | | Documentation: emphasize when git merge terminates early | Jonathan Nieder | 2010-01-24 | 1 | -10/+21 | |
| * | | | | | | | Documentation: merge: add an overview | Jonathan Nieder | 2010-01-24 | 1 | -2/+26 | |
| * | | | | | | | Documentation: merge: move merge strategy list to end | Jonathan Nieder | 2010-01-24 | 1 | -2/+2 | |
| * | | | | | | | Documentation: suggest `reset --merge` in How Merge Works section | Jonathan Nieder | 2010-01-24 | 1 | -3/+3 | |
| * | | | | | | | Documentation: merge: move configuration section to end | Jonathan Nieder | 2010-01-24 | 1 | -9/+9 | |
| * | | | | | | | Documentation: emphasise 'git shortlog' in its synopsis | Thomas Rast | 2010-01-10 | 1 | -1/+1 | |
| * | | | | | | | Documentation: show-files is now called git-ls-files | Thomas Rast | 2010-01-10 | 1 | -1/+1 | |
| * | | | | | | | Documentation: tiny git config manual tweaks | Jonathan Nieder | 2010-01-10 | 1 | -4/+4 | |
| * | | | | | | | Documentation: git gc packs refs by default now | Jonathan Nieder | 2010-01-10 | 1 | -9/+6 | |
* | | | | | | | | pull: re-fix command line generation | Junio C Hamano | 2010-01-24 | 2 | -1/+36 | |
| |_|_|_|/ / / |/| | | | | | | ||||||
* | | | | | | | rebase -i: Export GIT_AUTHOR_* variables explicitly | Junio C Hamano | 2010-01-24 | 1 | -4/+4 | |
* | | | | | | | Documentation: rev-list: fix synopsys for --tags and and --remotes | Christian Couder | 2010-01-23 | 1 | -2/+2 | |
* | | | | | | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2010-01-23 | 9 | -162/+1018 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | git-svn: allow subset of branches/tags to be specified in glob spec | Jay Soffian | 2010-01-23 | 4 | -20/+320 | |
| * | | | | | | | git-svn: allow UUID to be manually remapped via rewriteUUID | Jay Soffian | 2010-01-23 | 4 | -8/+140 | |
| * | | | | | | | git-svn: update svn mergeinfo test suite | Andrew Myrick | 2010-01-23 | 3 | -127/+485 | |
| * | | | | | | | git-svn: document --username/commit-url for branch/tag | Igor Mironov | 2010-01-23 | 1 | -0/+13 | |
| * | | | | | | | git-svn: add --username/commit-url options for branch/tag | Igor Mironov | 2010-01-23 | 1 | -2/+6 | |
| * | | | | | | | git-svn: respect commiturl option for branch/tag | Igor Mironov | 2010-01-23 | 1 | -1/+11 | |
| * | | | | | | | git-svn: fix mismatched src/dst errors for branch/tag | Igor Mironov | 2010-01-23 | 1 | -0/+4 | |
| * | | | | | | | git-svn: handle merge-base failures | Andrew Myrick | 2010-01-23 | 1 | -4/+15 | |
| * | | | | | | | git-svn: ignore changeless commits when checking for a cherry-pick | Andrew Myrick | 2010-01-23 | 1 | -0/+24 | |
* | | | | | | | | t7800-difftool.sh: Test mergetool.prompt fallback | David Aguilar | 2010-01-23 | 1 | -0/+12 | |
|/ / / / / / / | ||||||
* | | | | | | | msvc: Add a definition of NORETURN compatible with msvc compiler | Ramsay Jones | 2010-01-23 | 1 | -0/+3 | |
* | | | | | | | Update draft release notes to 1.7.0 | Junio C Hamano | 2010-01-23 | 1 | -1/+26 | |
* | | | | | | | msvc: Fix a compiler warning due to an incorrect pointer cast | Ramsay Jones | 2010-01-23 | 1 | -1/+1 | |
* | | | | | | | msvc: Fix an "unrecognized option" linker warning | Ramsay Jones | 2010-01-23 | 2 | -0/+2 | |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-01-23 | 2 | -9/+36 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | ignore duplicated slashes in make_relative_path() | Junio C Hamano | 2010-01-23 | 2 | -9/+36 | |
* | | | | | | | Merge branch 'jc/branch-d' | Junio C Hamano | 2010-01-23 | 2 | -10/+80 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | branch -d: base the "already-merged" safety on the branch it merges with | Junio C Hamano | 2009-12-30 | 2 | -10/+80 | |
* | | | | | | | | Merge branch 'il/rev-glob' | Junio C Hamano | 2010-01-23 | 9 | -19/+357 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Documentation: improve description of --glob=pattern and friends | Thomas Rast | 2010-01-22 | 1 | -17/+15 | |
| * | | | | | | | | rev-parse --branches/--tags/--remotes=pattern | Ilari Liusvaara | 2010-01-20 | 9 | -20/+139 | |
| * | | | | | | | | rev-parse --glob | Ilari Liusvaara | 2010-01-20 | 9 | -2/+223 | |
* | | | | | | | | | Merge branch 'js/refer-upstream' | Junio C Hamano | 2010-01-23 | 3 | -13/+192 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Teach @{upstream} syntax to strbuf_branchanme() | Junio C Hamano | 2010-01-20 | 2 | -45/+77 | |
| * | | | | | | | | | t1506: more test for @{upstream} syntax | Junio C Hamano | 2010-01-20 | 1 | -0/+41 | |
| * | | | | | | | | | Introduce <branch>@{upstream} notation | Johannes Schindelin | 2010-01-12 | 3 | -3/+109 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'jl/submodule-diff' | Junio C Hamano | 2010-01-23 | 14 | -52/+279 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Performance optimization for detection of modified submodules | Jens Lehmann | 2010-01-19 | 6 | -29/+56 | |
| * | | | | | | | | | git status: Show uncommitted submodule changes too when enabled | Jens Lehmann | 2010-01-18 | 4 | -9/+15 | |
| * | | | | | | | | | Teach diff that modified submodule directory is dirty | Junio C Hamano | 2010-01-17 | 2 | -3/+90 | |
| * | | | | | | | | | Show submodules as modified when they contain a dirty work tree | Jens Lehmann | 2010-01-17 | 4 | -17/+124 | |
* | | | | | | | | | | Merge branch 'il/remote-updates' | Junio C Hamano | 2010-01-23 | 3 | -1/+330 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add git remote set-url | Ilari Liusvaara | 2010-01-19 | 3 | -1/+330 |