summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'nd/index-format-doc'Junio C Hamano2012-12-211-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | index-format.txt: clarify what is "invalid"Nguyễn Thái Ngọc Duy2012-12-131-2/+3
* | | | | | | | | | | | Merge branch 'sl/git-svn-docs'Junio C Hamano2012-12-211-6/+85
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-svn: Note about tags.Sebastian Leske2012-12-051-0/+6
| * | | | | | | | | | | | git-svn: Expand documentation for --follow-parentSebastian Leske2012-12-051-3/+12
| * | | | | | | | | | | | git-svn: Recommend use of structure options.Sebastian Leske2012-12-051-3/+21
| * | | | | | | | | | | | git-svn: Document branches with at-sign(@).Sebastian Leske2012-12-051-0/+46
* | | | | | | | | | | | | Merge branch 'jk/mailmap-cleanup'Junio C Hamano2012-12-212-33/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | contrib: update stats/mailmap scriptJeff King2012-12-121-32/+64
| * | | | | | | | | | | | .mailmap: normalize emails for Linus TorvaldsJeff King2012-12-121-0/+6
| * | | | | | | | | | | | .mailmap: normalize emails for Jeff KingJeff King2012-12-121-0/+1
| * | | | | | | | | | | | .mailmap: fix broken entry for Martin LanghoffJeff King2012-12-121-1/+1
| * | | | | | | | | | | | .mailmap: match up some obvious names/emailsJeff King2012-12-121-0/+10
* | | | | | | | | | | | | Remove duplicate entry in ./Documentation/MakefileThomas Ackermann2012-12-191-1/+0
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-12-181-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | t7004: do not create unneeded gpghome/gpg.conf when GPG is not usedJunio C Hamano2012-12-181-1/+4
* | | | | | | | | | | | | Sync with 'maint'Junio C Hamano2012-12-181-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'jk/pickaxe-textconv' into maintJunio C Hamano2012-12-182-19/+54
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clarify -M without % symbol in diff-optionsSitaram Chamarty2012-12-181-1/+5
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Git 1.8.1-rc2v1.8.1-rc2Junio C Hamano2012-12-152-1/+7
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Renumber list in api-command.txtThomas Ackermann2012-12-151-7/+7
* | | | | | | | | | | | remote-testsvn: fix unitialized variableJeff King2012-12-151-1/+3
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-12-132-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fix sizeof usage in get_permutationsMatthew Daley2012-12-131-3/+3
| * | | | | | | | | | | git.txt: add missing info about --git-dir command-line optionManlio Perillo2012-12-131-0/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mh/doc-remote-helpers'Junio C Hamano2012-12-131-105/+140
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-remote-helpers.txt: clarify options & ref list attributesMax Horn2012-12-071-5/+12
| * | | | | | | | | | | git-remote-helpers.txt: clarify command <-> capability correspondencesMax Horn2012-12-071-5/+16
| * | | | | | | | | | | git-remote-helpers.txt: rearrange description of capabilitiesMax Horn2012-12-071-78/+56
| * | | | | | | | | | | git-remote-helpers.txt: minor grammar fixMax Horn2012-12-071-3/+3
| * | | | | | | | | | | git-remote-helpers.txt: document missing capabilitiesMax Horn2012-12-071-3/+42
| * | | | | | | | | | | git-remote-helpers.txt: document invocation before input formatMax Horn2012-12-071-31/+31
* | | | | | | | | | | | git(1): show link to contributor summary pageJunio C Hamano2012-12-121-1/+4
* | | | | | | | | | | | Merge branch 'so/prompt-command'Junio C Hamano2012-12-121-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | git-prompt.sh: update PROMPT_COMMAND documentationJunio C Hamano2012-12-121-5/+11
* | | | | | | | | | | | Add file completion to tcsh git completion.Marc Khouzam2012-12-111-15/+54
* | | | | | | | | | | | Merge branch 'ef/mingw-rmdir'Junio C Hamano2012-12-111-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | mingw_rmdir: do not prompt for retry when non-emptyErik Faye-Lund2012-12-101-1/+3
* | | | | | | | | | | | | Merge branch 'ef/mingw-tty-getpass'Junio C Hamano2012-12-113-56/+169
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mingw: get rid of getpass implementationErik Faye-Lund2012-12-042-17/+0
| * | | | | | | | | | | | | mingw: reuse tty-version of git_terminal_promptErik Faye-Lund2012-12-041-9/+60
| * | | | | | | | | | | | | compat/terminal: separate input and output handlesErik Faye-Lund2012-12-041-11/+18
| * | | | | | | | | | | | | compat/terminal: factor out echo-disablingErik Faye-Lund2012-12-041-18/+25
| * | | | | | | | | | | | | mingw: make fgetc raise SIGINT if apropriateErik Faye-Lund2012-12-042-10/+72
| * | | | | | | | | | | | | mingw: correct exit-code for SIGALRM's SIG_DFLErik Faye-Lund2012-12-041-2/+5
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-12-111-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | git-prompt: Document GIT_PS1_DESCRIBE_STYLEAnders Kaseorg2012-12-111-0/+9
* | | | | | | | | | | | | | Sync with 1.8.0.2Junio C Hamano2012-12-102-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Git 1.8.0.2v1.8.0.2Junio C Hamano2012-12-102-2/+3
| * | | | | | | | | | | | | Documentation/git-stash.txt: add a missing verbSébastien Loriot2012-12-101-1/+1