3 Commits (ba655da537a999670c7b21e0446e774a1f9733ea)

Author SHA1 Message Date
Matthieu Moy 4c371f9127 merge-recursive: point the user to commit when file would be overwritten. 15 years ago
Jeff King edf563fbaa status: make "how to stage" messages optional 16 years ago
Jeff King 75194438f4 push: make non-fast-forward help message configurable 16 years ago