summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen2013-10-131-1/+1
* Merge branch 'tz/credential-netrc'Jonathan Nieder2013-10-081-1/+3
|\
| * git-credential-netrc: fix uninitialized warningtz/credential-netrcTed Zlatanov2013-10-081-1/+3
* | contrib: remove ciabotStefan Beller2013-09-264-553/+0
* | Merge branch 'sg/complete-untracked-filter'Jonathan Nieder2013-09-241-2/+2
|\ \
| * | completion: improve untracked directory filtering for filename completionsg/complete-untracked-filterSZEDER Gábor2013-09-191-2/+2
* | | Merge branch 'es/contacts-in-subdir'Jonathan Nieder2013-09-241-0/+4
|\ \ \
| * | | contacts: fix to work in subdirectorieses/contacts-in-subdirEric Sunshine2013-09-171-0/+4
* | | | Merge branch 'maint'Jonathan Nieder2013-09-242-2/+35
|\ \ \ \
| * | | | git-remote-mediawiki: bugfix for pages w/ >500 revisionsBenoit Person2013-09-242-2/+35
* | | | | Merge branch 'fc/contrib-bzr-hg-fixes'Junio C Hamano2013-09-186-292/+327
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | contrib/remote-helpers: quote variable references in redirection targetsfc/contrib-bzr-hg-fixesJunio C Hamano2013-09-031-20/+20
| * | | | contrib/remote-helpers: style updates for test scriptsJunio C Hamano2013-09-034-226/+248
| * | | | remote-hg: use notes to keep track of Hg revisionsFelipe Contreras2013-08-301-1/+34
| * | | | remote-helpers: cleanup more global variablesFelipe Contreras2013-08-292-57/+2
| * | | | remote-helpers: trivial style fixesFelipe Contreras2013-08-292-3/+3
| * | | | remote-hg: improve basic testFelipe Contreras2013-08-291-2/+2
| * | | | remote-hg: add missing &&s in the testFelipe Contreras2013-08-291-2/+2
| * | | | remote-hg: fix testFelipe Contreras2013-08-291-2/+0
| * | | | remote-bzr: make bzr branches configurable per-repoFelipe Contreras2013-08-291-3/+10
| * | | | remote-bzr: fix export of utf-8 authorsFelipe Contreras2013-08-292-0/+31
* | | | | Merge branch 'rh/ishes-doc'Junio C Hamano2013-09-171-1/+1
|\ \ \ \ \
| * | | | | use 'commit-ish' instead of 'committish'Richard Hansen2013-09-041-1/+1
| |/ / / /
* | | | | Merge branch 'mm/mediawiki-dumb-push-fix'Junio C Hamano2013-09-122-2/+12
|\ \ \ \ \
| * | | | | git-remote-mediawiki: no need to update private ref in non-dumb pushmm/mediawiki-dumb-push-fixMatthieu Moy2013-09-031-1/+0
| * | | | | git-remote-mediawiki: use no-private-update capability on dumb pushMatthieu Moy2013-09-031-0/+3
| * | | | | git-remote-mediawiki: add test and check Makefile targetsMatthieu Moy2013-08-291-1/+9
| |/ / / /
* | | | | Merge branch 'jn/post-receive-utf8'Junio C Hamano2013-09-111-6/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | hooks/post-receive-email: set declared encoding to utf-8jn/post-receive-utf8Gerrit Pape2013-08-051-0/+3
| * | | | hooks/post-receive-email: force log messages in UTF-8Jonathan Nieder2013-08-051-4/+4
| * | | | hooks/post-receive-email: use plumbing instead of git log/showJonathan Nieder2013-08-051-6/+6
* | | | | Merge branch 'es/contacts-blame-L-multi'Junio C Hamano2013-09-091-9/+22
|\ \ \ \ \
| * | | | | contacts: reduce git-blame invocationses/contacts-blame-L-multiEric Sunshine2013-08-131-6/+5
| * | | | | contacts: gather all blame sources prior to invoking git-blameEric Sunshine2013-08-131-5/+20
| * | | | | contacts: validate hunk length earlierEric Sunshine2013-08-131-3/+2
| |/ / / /
* | | | | remote-bzr: reuse bzrlib transports when possibleRichard Hansen2013-09-081-12/+21
* | | | | Merge branch 'fc/remote-hg-shared-setup'Junio C Hamano2013-09-041-5/+18
|\ \ \ \ \
| * | | | | remote-hg: add shared repo upgradefc/remote-hg-shared-setupFelipe Contreras2013-08-111-0/+12
| * | | | | remote-hg: ensure shared repo is initializedFelipe Contreras2013-08-111-5/+6
| |/ / / /
* | | | | Merge branch 'ap/remote-hg-tilde-is-home-directory'Junio C Hamano2013-09-041-1/+1
|\ \ \ \ \
| * | | | | remote-hg: fix path when cloning with tilde expansionap/remote-hg-tilde-is-home-directoryAntoine Pelisse2013-08-091-1/+1
| |/ / / /
* | | | | Merge branch 'bc/completion-for-bash-3.0'Junio C Hamano2013-08-302-2/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | contrib/git-prompt.sh: handle missing 'printf -v' more gracefullybc/completion-for-bash-3.0Brandon Casey2013-08-221-1/+5
| * | | | git-completion.bash: use correct Bash/Zsh array length syntaxBrandon Casey2013-08-211-1/+1
| | |/ / | |/| |
* | | | Merge branch 'mm/war-on-whatchanged'Junio C Hamano2013-08-302-0/+43
|\ \ \ \ | |/ / / |/| | |
| * | | core-tutorial: trim the section on Inspecting ChangesJunio C Hamano2013-08-132-0/+43
| |/ /
* | | git-remote-mediawiki: ignore generated git-mwMatthieu Moy2013-08-131-0/+1
|/ /
* | Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat'Junio C Hamano2013-08-021-1/+0
|\ \
| * | cygwin: Remove the Win32 l/stat() implementationrj/cygwin-clarify-use-of-cheating-lstatRamsay Jones2013-07-181-1/+0
* | | Merge branch 'ob/typofixes'Junio C Hamano2013-08-013-4/+4
|\ \ \