summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* use @@PERL@@ in built scriptsjk/replace-perl-in-built-scriptsJeff King2013-10-294-5/+5
* Documentation/git-merge.txt: fix formatting of example blockmaint-1.8.2Andreas Schwab2013-09-051-2/+2
* fix shell syntax error in templateThorsten Glaser2013-08-301-0/+1
* Merge branch 'maint-1.8.1' into maint-1.8.2Junio C Hamano2013-07-031-1/+1
|\
| * git-config: update doc for --get with multiple valuesmaint-1.8.1John Keeping2013-07-031-1/+1
* | t0070 "mktemp to unwritable directory" needs SANITYTorsten Bögershausen2013-06-111-1/+1
* | pre-push.sample: Make the script executableWieland Hoffmann2013-06-111-0/+0
* | trivial: Add missing period in documentationPhil Hord2013-05-281-1/+1
* | Git 1.8.2.3v1.8.2.3Junio C Hamano2013-05-094-3/+23
* | Merge branch 'tr/copy-revisions-from-stdin' into maintJunio C Hamano2013-05-091-1/+2
|\ \
| * | read_revisions_from_stdin: make copies for handle_revision_argThomas Rast2013-04-161-1/+2
* | | t5004: avoid using tar for checking emptiness of archiveRené Scharfe2013-05-091-3/+2
* | | t5004: ignore pax global header fileRené Scharfe2013-05-091-1/+1
* | | mergetools/kdiff3: do not use --auto when diffingDavid Aguilar2013-05-091-1/+1
* | | transport-helper: trivial style cleanupFelipe Contreras2013-05-091-2/+1
* | | Merge branch 'tr/remote-tighten-commandline-parsing' into maintJunio C Hamano2013-05-033-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 'jn/glossary-revision' into maintJunio C Hamano2013-05-031-3/+1
|\ \ \ \
| * | | | glossary: a revision is just a commitJonathan Nieder2013-04-211-3/+1
* | | | | completion: zsh: don't override suffix on _detaultFelipe Contreras2013-05-031-1/+1
* | | | | Documentation/git-commit: Typo under --editAnders Granskogen Bjørnstad2013-05-021-2/+2
* | | | | 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
|/ / / / /
* | | | | documentation: trivial whitespace cleanupsFelipe Contreras2013-04-281-6/+6
* | | | | t/Makefile: remove smoke test targetsJohn Keeping2013-04-281-38/+0
* | | | | Git 1.8.2.2v1.8.2.2Junio C Hamano2013-04-263-2/+21
* | | | | Merge branch 'jk/a-thread-only-dies-once' into maintJunio C Hamano2013-04-263-6/+26
|\ \ \ \ \
| * | | | | run-command: use thread-aware die_is_recursing routineJeff King2013-04-161-0/+11
| * | | | | usage: allow pluggable die-recursion checksJeff King2013-04-162-6/+15
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jn/gitweb-install-doc' into maintJunio C Hamano2013-04-262-8/+12
|\ \ \ \ \
| * | | | | gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibilityJonathan Nieder2013-04-171-0/+7
| * | | | | gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEMJakub Narębski2013-04-151-8/+5
* | | | | | Merge branch 'fc/untracked-zsh-prompt' into maintJunio C Hamano2013-04-261-1/+1
|\ \ \ \ \ \
| * | | | | | prompt: fix untracked files for zshFelipe Contreras2013-04-211-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maintJunio C Hamano2013-04-261-1/+4
|\ \ \ \ \ \
| * | | | | | receive-pack: close sideband fd on early pack errorsJeff King2013-04-191-1/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/chopped-ident' into maintJunio C Hamano2013-04-265-99/+75
|\ \ \ \ \ \
| * | | | | | blame: handle broken commit headers gracefullyRené Scharfe2013-04-171-3/+8
| * | | | | | pretty: handle broken commit headers gracefullyRené Scharfe2013-04-172-21/+66
| * | | | | | cat-file: print tags raw for "cat-file -p"Jeff King2013-04-172-75/+1
* | | | | | | Merge branch 'rt/commentchar-fmt-merge-msg' into maintJunio C Hamano2013-04-262-7/+29
|\ \ \ \ \ \ \
| * | | | | | | t6200: avoid path mangling issue on WindowsJohannes Sixt2013-04-181-3/+3
| * | | | | | | fmt-merge-msg: use core.commentchar in tag signatures completelyRalf Thielow2013-04-071-4/+8
| * | | | | | | fmt-merge-msg: respect core.commentchar in people creditsRalf Thielow2013-04-072-3/+21