summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* contrib/subtree: don't delete remote branches if split failsJohn Keeping2013-05-011-1/+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
* | | | | | Merge branch 'rs/empty-archive' into maintJunio C Hamano2013-04-261-1/+1
|\ \ \ \ \ \
| * | | | | | t5004: fix issue with empty archive test and bsdtarRené Scharfe2013-04-101-1/+1
* | | | | | | Merge branch 'pe/pull-rebase-v-q' into maintJunio C Hamano2013-04-262-1/+28
|\ \ \ \ \ \ \
| * | | | | | | pull: Apply -q and -v options to rebase mode as wellPeter Eisentraut2013-03-162-1/+28
* | | | | | | | t7409: do not use export X=YTorsten Bögershausen2013-04-261-4/+10
* | | | | | | | test-hg-hg-git.sh: do not use export X=YTorsten Bögershausen2013-04-261-4/+6
* | | | | | | | test-hg-bidi.sh: do not use export X=YTorsten Bögershausen2013-04-261-5/+6
* | | | | | | | t9501: do not use export X=YTorsten Bögershausen2013-04-261-5/+10
* | | | | | | | t9020: do not use export X=YTorsten Bögershausen2013-04-261-1/+2
* | | | | | | | Update draft release notes to 1.8.2.2Junio C Hamano2013-04-241-0/+18
* | | | | | | | Merge branch 'jk/diff-algo-finishing-touches' into maintJunio C Hamano2013-04-242-2/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: allow unstuck arguments with --diff-algorithmJohn Keeping2013-04-051-2/+3
| * | | | | | | | git-merge(1): document diff-algorithm option to merge-recursiveJohn Keeping2013-04-051-0/+6
* | | | | | | | | Merge branch 'sr/log-SG-no-textconv' into maintJunio C Hamano2013-04-242-72/+86
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diffcore-pickaxe: unify code for log -S/-GJeff King2013-04-051-69/+49
| * | | | | | | | | diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"Junio C Hamano2013-04-051-5/+7
| * | | | | | | | | diffcore-pickaxe: port optimization from has_changes() to diff_grep()Junio C Hamano2013-04-051-1/+6
| * | | | | | | | | diffcore-pickaxe: respect --no-textconvSimon Ruderich2013-04-052-4/+36
| * | | | | | | | | diffcore-pickaxe: remove fill_one()Jeff King2013-04-041-20/+10
| * | | | | | | | | diffcore-pickaxe: remove unnecessary call to get_textconv()Simon Ruderich2013-04-041-9/+14
* | | | | | | | | | Merge branch 'jc/merge-tag-object' into maintJunio C Hamano2013-04-242-32/+81
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t6200: test message for merging of an annotated tagJunio C Hamano2013-04-011-0/+39
View Lorry Controller Status