summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix grammar in the 1.8.3 release notes.Marc Branchaud2013-05-021-78/+77
* Merge branch 'hb/git-pm-tempfile'Junio C Hamano2013-05-021-1/+1
|\
| * Git.pm: call tempfile from File::Temp as a regular functionH. Merijn Brand2013-04-291-1/+1
* | Merge branch 'rs/pp-user-info-without-extra-allocation'Junio C Hamano2013-05-021-35/+14
|\ \
| * | pretty: remove intermediate strbufs from pp_user_info()René Scharfe2013-04-261-20/+9
| * | pretty: simplify output line length calculation in pp_user_info()René Scharfe2013-04-261-4/+3
| * | pretty: simplify input line length calculation in pp_user_info()René Scharfe2013-04-261-11/+2
* | | Merge branch 'tr/remote-tighten-commandline-parsing'Junio C Hamano2013-05-023-3/+25
|\ \ \
| * | | remote: 'show' and 'prune' can take more than one remoteThomas Rast2013-04-242-10/+5
| * | | remote: check for superfluous arguments in 'git remote add'Thomas Rast2013-04-242-2/+2
| * | | remote: add a test for extra arguments, according to docsThomas Rast2013-04-241-0/+27
* | | | Merge branch 'zk/prompt-rebase-step'Junio C Hamano2013-05-023-9/+31
|\ \ \ \
| * | | | bash-prompt.sh: show where rebase is at when stoppedZoltan Klinger2013-04-253-9/+31
| |/ / /
* | | | git-completion.bash: add remote.pushdefault to config listRamkumar Ramachandra2013-04-291-0/+5
* | | | git-completion.bash: add branch.*.pushremote to config listRamkumar Ramachandra2013-04-291-2/+2
* | | | Merge branch 'maint'Junio C Hamano2013-04-292-9/+136
|\ \ \ \
| * \ \ \ Merge branch 'fc/zsh-completion' into maintJunio C Hamano2013-04-291-8/+126
| |\ \ \ \
| | * | | | complete: zsh: use zsh completion for the main cmdFelipe Contreras2013-04-291-1/+119
| | * | | | complete: zsh: trivial simplificationFelipe Contreras2013-04-291-8/+8
| * | | | | git-completion.bash: complete branch.*.rebase as booleanRamkumar Ramachandra2013-04-291-0/+4
| * | | | | git-completion.bash: add diff.submodule to config listRamkumar Ramachandra2013-04-291-0/+5
| * | | | | git-completion.bash: lexical sorting for diff.statGraphWidthRamkumar Ramachandra2013-04-291-1/+1
| |/ / / /
* | | | | Merge branch 'maint'Junio C Hamano2013-04-282-44/+6
|\| | | |
| * | | | documentation: trivial whitespace cleanupsFelipe Contreras2013-04-281-6/+6
| * | | | t/Makefile: remove smoke test targetsJohn Keeping2013-04-281-38/+0
* | | | | Merge branch 'nd/pretty-formats'Junio C Hamano2013-04-281-2/+2
|\ \ \ \ \
| * | | | | pretty: Fix bug in truncation support for %>, %< and %><Ramsay Jones2013-04-281-2/+2
* | | | | | Merge branch 'jk/check-corrupt-objects-carefully'Junio C Hamano2013-04-281-1/+1
|\ \ \ \ \ \
| * | | | | | clone: Make the 'junk_mode' symbol a file staticRamsay Jones2013-04-281-1/+1
* | | | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-04-282-1/+14
|\ \ \ \ \ \ \
| * | | | | | | merge-tree: fix typo in "both changed identically"John Keeping2013-04-282-1/+14
* | | | | | | | completion: add missing format-patch optionsFelipe Contreras2013-04-281-1/+2
* | | | | | | | Git 1.8.3-rc0v1.8.3-rc0Junio C Hamano2013-04-272-19/+9
* | | | | | | | Merge branch 'rr/shortlog-doc'Junio C Hamano2013-04-275-22/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/shortlog.c: make usage string consistent with logRamkumar Ramachandra2013-04-221-3/+1
| * | | | | | | | builtin/log.c: make usage string consistent with docRamkumar Ramachandra2013-04-221-1/+1
| * | | | | | | | git-shortlog.txt: make SYNOPSIS match log, update OPTIONSRamkumar Ramachandra2013-04-221-2/+17
| * | | | | | | | git-log.txt: rewrite note on why "--" may be requiredRamkumar Ramachandra2013-04-221-2/+2
| * | | | | | | | git-log.txt: generalize <since>..<until>Ramkumar Ramachandra2013-04-221-7/+9
| * | | | | | | | git-log.txt: order OPTIONS properly; move <since>..<until>Ramkumar Ramachandra2013-04-221-7/+7
| * | | | | | | | revisions.txt: clarify the .. and ... syntaxRamkumar Ramachandra2013-04-221-2/+4
| * | | | | | | | git-shortlog.txt: remove (-h|--help) from OPTIONSRamkumar Ramachandra2013-04-211-4/+0
* | | | | | | | | Merge branch 'th/bisect-skipped-log'Junio C Hamano2013-04-272-0/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bisect: Log possibly bad, skipped commits at bisection endTorstein Hegge2013-04-232-0/+30
* | | | | | | | | | Merge branch 'ph/rebase-original'Junio C Hamano2013-04-272-1/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase: find orig_head unambiguouslyPhil Hord2013-04-242-1/+8
* | | | | | | | | | | Merge branch 'jn/glossary-revision'Junio C Hamano2013-04-271-3/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | glossary: a revision is just a commitJonathan Nieder2013-04-221-3/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/add-ignore-removal'Junio C Hamano2013-04-272-10/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git add: rephrase -A/--no-all warningJunio C Hamano2013-04-221-6/+6