userdiff: fix grammar and style issues

Boxuan Li committed over 7 years ago

Merge branch 'master' of git://github.com/alshopov/git-po

Jiang Xin committed over 7 years ago

l10n: bg.po: Updated Bulgarian translation (4577t)

Alexander Shopov committed over 7 years ago

doc: hint about GIT_DEBUGGER in CodingGuidelines

Emily Shaffer committed over 7 years ago

p4 unshelve: fix "Not a valid object name HEAD0" on Windows

Mike Mueller committed over 7 years ago

sha1-file: split OBJECT_INFO_FOR_PREFETCH

Derrick Stolee committed over 7 years ago

rebase docs: recommend `-r` over `-p`

Johannes Schindelin committed over 7 years ago

docs: say that `--rebase=preserve` is deprecated

Johannes Schindelin committed over 7 years ago

tests: mark a couple more test cases as requiring `rebase -p`

Johannes Schindelin committed over 7 years ago

request-pull: warn if the remote object is not the same as the local one

Paolo Bonzini committed over 7 years ago

request-pull: quote regex metacharacters in local ref

Paolo Bonzini committed over 7 years ago

bundle verify: error out if called without an object database

Johannes Schindelin committed over 7 years ago

mark_fsmonitor_valid(): mark the index as changed if needed

Johannes Schindelin committed over 7 years ago

fill_stat_cache_info(): prepare for an fsmonitor fix

Johannes Schindelin committed over 7 years ago

merge: refuse --commit with --squash

Vishal Verma committed over 7 years ago

server-info: do not list unlinked packs

Eric Wong committed over 7 years ago

fetch-pack: send server options after command

Jonathan Tan committed over 7 years ago

grep: fail if call could output and name is null

Emily Shaffer committed over 7 years ago

git-p4: allow unshelving of branched files

Simon Williams committed over 7 years ago

trace2: fix tracing when NO_PTHREADS is defined

Jeff Hostetler committed over 7 years ago