3 Commits (f9ad77a739c0d012ee58b64eda2d7ec0d4e1df9d)

Author SHA1 Message Date
Matthieu Moy 4c371f9127 merge-recursive: point the user to commit when file would be overwritten. 16 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