| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'ns/rebase-auto-squash' | Junio C Hamano | 2010-01-20 | 1 | -0/+10 |
| |\ \ \ \ \ | |||||
| | * | | | | | rebase -i --autosquash: auto-squash commits | Nanako Shiraishi | 2010-01-06 | 1 | -0/+10 |
| * | | | | | | Merge branch 'mh/rebase-fixup' (early part) | Junio C Hamano | 2010-01-20 | 1 | -5/+8 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Add a command "fixup" to rebase --interactive | Michael Haggerty | 2009-12-07 | 1 | -5/+8 |
| * | | | | | | Merge branch 'il/push-set-upstream' | Junio C Hamano | 2010-01-20 | 1 | -1/+8 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add push --set-upstream | Ilari Liusvaara | 2010-01-16 | 1 | -1/+8 |
| * | | | | | | | Merge branch 'jk/warn-author-committer-after-commit' | Junio C Hamano | 2010-01-20 | 3 | -0/+16 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | commit: allow suppression of implicit identity advice | Jeff King | 2010-01-14 | 1 | -0/+4 |
| | * | | | | | | | strbuf: add strbuf_addbuf_percentquote | Jeff King | 2010-01-14 | 1 | -0/+7 |
| | * | | | | | | | strbuf_expand: convert "%%" to "%" | Jeff King | 2010-01-14 | 2 | -0/+5 |
| | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'sd/cd-p-show-toplevel' | Junio C Hamano | 2010-01-20 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add 'git rev-parse --show-toplevel' option. | Steven Drake | 2010-01-11 | 1 | -0/+3 |
| | |/ / / / / / | |||||
| * | | | | | | | Sync with 1.6.6.1 | Junio C Hamano | 2010-01-20 | 3 | -8/+45 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | | Git 1.6.6.1v1.6.6.1 | Junio C Hamano | 2010-01-20 | 2 | -7/+15 |
| | * | | | | | | Merge branch 'bg/maint-add-all-doc' into maint | Junio C Hamano | 2010-01-20 | 2 | -29/+88 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'maint-1.6.5' into maint | Junio C Hamano | 2010-01-20 | 2 | -1/+30 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Git 1.6.5.8v1.6.5.8 | Junio C Hamano | 2010-01-20 | 2 | -1/+30 |
| * | | | | | | | | | Update draft release notes to 1.7.0 | Junio C Hamano | 2010-01-18 | 1 | -1/+16 |
| * | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-01-18 | 1 | -1/+16 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | Update draft release notes to 1.6.6.1 | Junio C Hamano | 2010-01-18 | 1 | -1/+16 |
| * | | | | | | | | | Merge branch 'jc/rerere' | Junio C Hamano | 2010-01-18 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 2009-12-04 | 1 | -1/+6 |
| | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | | Update draft release notes to 1.7.0 | Junio C Hamano | 2010-01-17 | 1 | -1/+38 |
| * | | | | | | | | | Merge branch 'jh/commit-status' | Junio C Hamano | 2010-01-17 | 2 | -1/+18 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | commit: support commit.status, --status, and --no-status | James P. Howard, II | 2010-01-13 | 2 | -1/+18 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/Documentation