Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'rj/maint-simplify-cygwin-makefile' into maint
Junio C Hamano
Merge branch 'rg/doc-workflow' into maint
Junio C Hamano
Merge branch 'np/maint-sideband-favor-status' into maint
Junio C Hamano
Documentation: xmlto 0.0.18 does not know --stringparam
Brandon Casey
t4201: use ISO8859-1 rather than ISO-8859-1
Jan Krüger
pull: clarify advice for the unconfigured error case
Junio C Hamano
Git 1.6.5.4
Tags
v1.6.5.4
Junio C Hamano
Unconditionally set man.base.url.for.relative.links
Junio C Hamano
Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make
Junio C Hamano
Prepare for 1.6.5.4
Junio C Hamano
merge: do not add standard message when message is given with -m option
Junio C Hamano
Do not misidentify "git merge foo HEAD" as an old-style invocation
David Aguilar
help: Do not unnecessarily look for a repository
Michael J Gruber
Documentation: Fix a few i.e./e.g. mix-ups
php
Documentation: Document --branch option in git clone synopsis
Matthieu Moy
builtin-merge: show user-friendly error messages for fast-forward too.
Matthieu Moy
merge-recursive: make the error-message generation an extern function
Avery Pennarun
builtin-merge.c: call exclude_cmds() correctly.
Junio C Hamano
Remove dead code from "git am"
Felipe Contreras
format-patch: add test for parsing of "--"
Felipe Contreras
format-patch: fix parsing of "--" on the command line
Junio C Hamano
builtin-apply.c: pay attention to -p<n> when determining the name
Uwe Kleine-König
shortlog: respect commit encoding
Nicolas Pitre
pack-objects: split implications of --all-progress from progress activation
Stephen Boyd
instaweb: restart server if already running
Jeff King
prune-packed: only show progress when stderr is a tty
Junio C Hamano
Protect scripted Porcelains from GREP_OPTIONS insanity
René Scharfe
mergetool--lib: simplify guess_merge_tool()
Matthieu Moy
user-manual: Document that "git merge" doesn't like uncommited changes.
Matthieu Moy
merge-recursive: point the user to commit when file would be overwritten.
  1. Prev
  2. Next