Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | |
* | | | | | | Documentation: rev-list: fix synopsys for --tags and and --remotes | Christian Couder | 2010-01-23 | 1 | -2/+2 | |
* | | | | | | git-svn: allow subset of branches/tags to be specified in glob spec | Jay Soffian | 2010-01-23 | 1 | -0/+16 | |
* | | | | | | git-svn: allow UUID to be manually remapped via rewriteUUID | Jay Soffian | 2010-01-23 | 1 | -3/+12 | |
* | | | | | | git-svn: document --username/commit-url for branch/tag | Igor Mironov | 2010-01-23 | 1 | -0/+13 | |
* | | | | | | Update draft release notes to 1.7.0 | Junio C Hamano | 2010-01-22 | 1 | -1/+26 | |
* | | | | | | Merge branch 'il/rev-glob' | Junio C Hamano | 2010-01-22 | 4 | -17/+52 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Documentation: improve description of --glob=pattern and friends | Thomas Rast | 2010-01-21 | 1 | -17/+15 | |
| * | | | | | | rev-parse --branches/--tags/--remotes=pattern | Ilari Liusvaara | 2010-01-20 | 4 | -17/+30 | |
| * | | | | | | rev-parse --glob | Ilari Liusvaara | 2010-01-20 | 4 | -0/+24 | |
* | | | | | | | Merge branch 'js/refer-upstream' | Junio C Hamano | 2010-01-22 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Introduce <branch>@{upstream} notation | Johannes Schindelin | 2010-01-12 | 1 | -0/+4 | |
* | | | | | | | | Merge branch 'il/remote-updates' | Junio C Hamano | 2010-01-22 | 1 | -0/+17 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add git remote set-url | Ilari Liusvaara | 2010-01-18 | 1 | -0/+17 | |
* | | | | | | | | | Merge branch 'il/branch-set-upstream' | Junio C Hamano | 2010-01-22 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add branch --set-upstream | Ilari Liusvaara | 2010-01-18 | 1 | -1/+7 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'jc/maint-limit-note-output' | Junio C Hamano | 2010-01-22 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
| * | | | | | | | | Fix "log --oneline" not to show notes | Junio C Hamano | 2010-01-21 | 1 | -2/+2 | |
| * | | | | | | | | Fix "log" family not to be too agressive about showing notes | Junio C Hamano | 2010-01-20 | 1 | -0/+8 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | git-rebase.txt: Fix spelling | Horst H. von Brand | 2010-01-21 | 1 | -1/+1 | |
* | | | | | | | | conflict-marker-size: add test and docs | Junio C Hamano | 2010-01-20 | 1 | -0/+17 | |
* | | | | | | | | Update draft release notes to 1.7.0 | Junio C Hamano | 2010-01-20 | 1 | -1/+45 | |
* | | | | | | | | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 | 3 | -3/+43 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Document that merge strategies can now take their own options | Junio C Hamano | 2010-01-17 | 2 | -1/+33 | |
| * | | | | | | | | git-merge-file --ours, --theirs | Junio C Hamano | 2009-11-29 | 1 | -2/+10 | |
* | | | | | | | | | Merge remote branch 'remotes/trast-doc/for-next' | Junio C Hamano | 2010-01-20 | 116 | -685/+693 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
| * | | | | | | | | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 | 112 | -647/+647 | |
| * | | | | | | | | Documentation: format full commands in typewriter font | Thomas Rast | 2010-01-10 | 12 | -28/+28 | |
| * | | | | | | | | Documentation: warn prominently against merging with dirty trees | Thomas Rast | 2010-01-09 | 2 | -0/+8 | |
| * | | | | | | | | Documentation/git-merge: reword references to "remote" and "pull" | Thomas Rast | 2010-01-09 | 1 | -17/+17 | |
* | | | | | | | | | Merge branch 'rr/core-tutorial' | Junio C Hamano | 2010-01-20 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Documentation: Update git core tutorial clarifying reference to scripts | Ramkumar Ramachandra | 2010-01-16 | 1 | -0/+8 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'jc/grep-lookahead' | Junio C Hamano | 2010-01-20 | 1 | -8/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | grep: rip out support for external grep | Junio C Hamano | 2010-01-13 | 1 | -8/+0 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'mm/conflict-advice' | Junio C Hamano | 2010-01-20 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy | 2010-01-12 | 1 | -0/+4 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2010-01-20 | 2 | -1/+20 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | difftool: Add '-x' and as an alias for '--extcmd' | David Aguilar | 2010-01-15 | 1 | -1/+2 | |
| * | | | | | | | | | git-diff.txt: Link to git-difftool | David Aguilar | 2010-01-09 | 1 | -0/+4 | |
| * | | | | | | | | | difftool: Allow specifying unconfigured commands with --extcmd | David Aguilar | 2010-01-09 | 1 | -0/+5 | |
| * | | | | | | | | | git-difftool: Add '--gui' for selecting a GUI tool | David Aguilar | 2010-01-03 | 1 | -0/+9 | |
| |/ / / / / / / / |