summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Update draft release notes to 1.7.0Junio C Hamano2010-01-221-1/+26
* Merge branch 'il/rev-glob'Junio C Hamano2010-01-224-17/+52
|\
| * Documentation: improve description of --glob=pattern and friendsThomas Rast2010-01-211-17/+15
| * rev-parse --branches/--tags/--remotes=patternIlari Liusvaara2010-01-204-17/+30
| * rev-parse --globIlari Liusvaara2010-01-204-0/+24
* | Merge branch 'js/refer-upstream'Junio C Hamano2010-01-221-0/+4
|\ \
| * | Introduce <branch>@{upstream} notationJohannes Schindelin2010-01-121-0/+4
* | | Merge branch 'il/remote-updates'Junio C Hamano2010-01-221-0/+17
|\ \ \
| * | | Add git remote set-urlIlari Liusvaara2010-01-181-0/+17
* | | | Merge branch 'il/branch-set-upstream'Junio C Hamano2010-01-221-1/+7
|\ \ \ \
| * | | | Add branch --set-upstreamIlari Liusvaara2010-01-181-1/+7
| |/ / /
* | | | Merge branch 'jc/maint-limit-note-output'Junio C Hamano2010-01-221-0/+8
|\ \ \ \
| * | | | Fix "log --oneline" not to show notesJunio C Hamano2010-01-211-2/+2
| * | | | Fix "log" family not to be too agressive about showing notesJunio C Hamano2010-01-201-0/+8
* | | | | git-rebase.txt: Fix spellingHorst H. von Brand2010-01-211-1/+1
* | | | | conflict-marker-size: add test and docsJunio C Hamano2010-01-201-0/+17
* | | | | Update draft release notes to 1.7.0Junio C Hamano2010-01-201-1/+45
* | | | | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-203-3/+43
|\ \ \ \ \
| * | | | | Document that merge strategies can now take their own optionsJunio C Hamano2010-01-172-1/+33
| * | | | | git-merge-file --ours, --theirsJunio C Hamano2009-11-291-2/+10
* | | | | | Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-20116-685/+693
|\ \ \ \ \ \
| * | | | | | Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-10112-647/+647
| * | | | | | Documentation: format full commands in typewriter fontThomas Rast2010-01-1012-28/+28
| * | | | | | Documentation: warn prominently against merging with dirty treesThomas Rast2010-01-092-0/+8
| * | | | | | Documentation/git-merge: reword references to "remote" and "pull"Thomas Rast2010-01-091-17/+17
* | | | | | | Merge branch 'rr/core-tutorial'Junio C Hamano2010-01-201-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Documentation: Update git core tutorial clarifying reference to scriptsRamkumar Ramachandra2010-01-161-0/+8
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jc/grep-lookahead'Junio C Hamano2010-01-201-8/+0
|\ \ \ \ \ \ \
| * | | | | | | grep: rip out support for external grepJunio C Hamano2010-01-131-8/+0
| |/ / / / / /
* | | | | | | Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-201-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-0/+4
| |/ / / / / /
* | | | | | | Merge branch 'da/difftool'Junio C Hamano2010-01-202-1/+20
|\ \ \ \ \ \ \
| * | | | | | | difftool: Add '-x' and as an alias for '--extcmd'David Aguilar2010-01-151-1/+2
| * | | | | | | git-diff.txt: Link to git-difftoolDavid Aguilar2010-01-091-0/+4
| * | | | | | | difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar2010-01-091-0/+5
| * | | | | | | git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar2010-01-031-0/+9
| |/ / / / / /
* | | | | | | Merge branch 'ns/rebase-auto-squash'Junio C Hamano2010-01-201-0/+10
|\ \ \ \ \ \ \
| * | | | | | | rebase -i --autosquash: auto-squash commitsNanako Shiraishi2010-01-061-0/+10
* | | | | | | | Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano2010-01-201-5/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add a command "fixup" to rebase --interactiveMichael Haggerty2009-12-071-5/+8
* | | | | | | | Merge branch 'il/push-set-upstream'Junio C Hamano2010-01-201-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Add push --set-upstreamIlari Liusvaara2010-01-161-1/+8
* | | | | | | | | Merge branch 'jk/warn-author-committer-after-commit'Junio C Hamano2010-01-203-0/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: allow suppression of implicit identity adviceJeff King2010-01-141-0/+4
| * | | | | | | | | strbuf: add strbuf_addbuf_percentquoteJeff King2010-01-141-0/+7
| * | | | | | | | | strbuf_expand: convert "%%" to "%"Jeff King2010-01-142-0/+5
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sd/cd-p-show-toplevel'Junio C Hamano2010-01-201-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add 'git rev-parse --show-toplevel' option.Steven Drake2010-01-111-0/+3
| |/ / / / / / / /
* | | | | | | | | Sync with 1.6.6.1Junio C Hamano2010-01-203-8/+45
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Git 1.6.6.1v1.6.6.1Junio C Hamano2010-01-202-7/+15