summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/capabilities'Junio C Hamano2012-08-298-17/+102
|\
| * fetch-pack: mention server version with verbose outputJeff King2012-08-131-1/+8
| * parse_feature_request: make it easier to see feature valuesJeff King2012-08-132-10/+39
| * fetch-pack: do not ask for unadvertised capabilitiesJunio C Hamano2012-08-101-0/+6
| * do not send client agent unless server does firstJeff King2012-08-102-4/+15
| * send-pack: fix capability-sending logicJeff King2012-08-101-1/+1
| * include agent identifier in capability stringJeff King2012-08-036-6/+38
* | Merge branch 'mg/rebase-i-onto-reflog-in-full'Junio C Hamano2012-08-291-2/+1
|\ \
| * | rebase -i: use full onto sha1 in reflogMichael J Gruber2012-08-101-2/+1
* | | Merge branch 'mz/empty-rebase-test'Junio C Hamano2012-08-291-1/+17
|\ \ \
| * | | add tests for 'git rebase --keep-empty'Martin von Zweigbergk2012-08-091-1/+17
* | | | Merge branch 'jc/maint-protect-sh-from-ifs'Junio C Hamano2012-08-291-0/+4
|\ \ \ \
| * | | | sh-setup: protect from exported IFSJunio C Hamano2012-08-081-0/+4
* | | | | Merge branch 'bc/prune-info'Junio C Hamano2012-08-291-1/+2
|\ \ \ \ \
| * | | | | prune.c: only print informational message in show_only or verbose modeBrandon Casey2012-08-071-1/+2
* | | | | | Merge branch 'mz/cherry-code-cleanup'Junio C Hamano2012-08-291-16/+6
|\ \ \ \ \ \
| * | | | | | cherry: remove redundant check for merge commitMartin von Zweigbergk2012-07-291-8/+2
| * | | | | | cherry: don't set ignored rev_info optionsMartin von Zweigbergk2012-07-291-4/+0
| * | | | | | remove unnecessary parameter from get_patch_ids()Martin von Zweigbergk2012-07-291-4/+4
* | | | | | | First half of the second batch for 1.8.0Junio C Hamano2012-08-271-0/+37
* | | | | | | Merge branch 'jk/docs-docbook-monospace-display'Junio C Hamano2012-08-272-3/+3
|\ \ \ \ \ \ \
| * | | | | | | docs: monospace listings in docbook outputJeff King2012-08-072-3/+3
* | | | | | | | Merge branch 'da/difftool-updates'Junio C Hamano2012-08-276-101/+244
|\ \ \ \ \ \ \ \
| * | | | | | | | difftool: silence warningRoss Lagerwall2012-08-211-1/+1
| * | | | | | | | Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth2012-08-103-2/+27
| * | | | | | | | mergetool,difftool: Document --tool-help consistentlyDavid Aguilar2012-08-102-3/+6
| * | | | | | | | difftool: Disable --symlinks on cygwinDavid Aguilar2012-07-261-1/+2
| * | | | | | | | difftool: Handle compare() returning -1David Aguilar2012-07-261-31/+68
| * | | | | | | | difftool: Wrap long lines for readabilityDavid Aguilar2012-07-261-14/+32
| * | | | | | | | difftool: Check all return codes from compare()David Aguilar2012-07-251-1/+10
| * | | | | | | | difftool: Handle finding mergetools/ in a path with spacesDavid Aguilar2012-07-251-6/+21
| * | | | | | | | difftool: Use symlinks when diffing against the worktreeDavid Aguilar2012-07-232-10/+31
| * | | | | | | | difftool: Call the temp directory "git-difftool"David Aguilar2012-07-221-1/+1
| * | | | | | | | difftool: Move option values into a hashDavid Aguilar2012-07-221-24/+31
| * | | | | | | | difftool: Eliminate global variablesDavid Aguilar2012-07-221-53/+75
| * | | | | | | | difftool: Simplify print_tool_help()David Aguilar2012-07-221-20/+5
* | | | | | | | | Merge branch 'js/grep-patterntype-config'Junio C Hamano2012-08-275-42/+281
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep: add a grep.patternType configuration settingJ Smith2012-08-035-42/+281
* | | | | | | | | | Merge branch 'bc/receive-pack-stdout-protection'Junio C Hamano2012-08-272-1/+37
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | receive-pack: do not leak output from auto-gc to standard outputJunio C Hamano2012-08-062-2/+3
| * | | | | | | | | | t/t5400: demonstrate breakage caused by informational message from pruneBrandon Casey2012-08-061-0/+35
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ab/diff-write-incomplete-line'Junio C Hamano2012-08-272-0/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix '\ No newline...' annotation in rewrite diffsAdam Butcher2012-08-052-0/+31
* | | | | | | | | | | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh'Junio C Hamano2012-08-271-8/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t7406: fix misleading "rev-parse --max-count=1 HEAD"Junio C Hamano2012-07-301-8/+8
* | | | | | | | | | | | Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-2718-32/+188
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fsck: detect null sha1 in tree entriesJeff King2012-07-292-1/+33
| * | | | | | | | | | | | do not write null sha1s to on-disk indexJeff King2012-07-292-0/+21
| * | | | | | | | | | | | diff: do not use null sha1 as a sentinel valueJeff King2012-07-2914-32/+135
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mm/push-default-switch-warning'Junio C Hamano2012-08-272-3/+31
|\ \ \ \ \ \ \ \ \ \ \ \