diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2013-09-24 23:35:24 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-09-24 23:35:24 -0700 |
| commit | 80f165a58a41ffd37ec24022db8e568bc5165075 (patch) | |
| tree | c0c768386b696dc99860044993ce7d8b16938756 /contrib/completion/git-prompt.sh | |
| parent | Merge branch 'kb/msvc-compile' (diff) | |
| parent | Doc: 'replace' merge and non-merge commits (diff) | |
| download | tgif-80f165a58a41ffd37ec24022db8e568bc5165075.tar.xz | |
Merge branch 'cc/replace-with-the-same-type'
* cc/replace-with-the-same-type:
Doc: 'replace' merge and non-merge commits
t6050-replace: use some long option names
replace: allow long option names
Documentation/replace: add Creating Replacement Objects section
t6050-replace: add test to clean up all the replace refs
t6050-replace: test that objects are of the same type
Documentation/replace: state that objects must be of the same type
replace: forbid replacing an object with one of a different type
Diffstat (limited to 'contrib/completion/git-prompt.sh')
0 files changed, 0 insertions, 0 deletions