summaryrefslogtreecommitdiff
path: root/rerere.h
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2013-10-14 11:07:50 -0700
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2013-10-14 11:07:50 -0700
commit865156a7cb72a579c144220204fd7b447ca4e50f (patch)
tree0e43d15116202baae9c558cfa3b27f9136712b2f /rerere.h
parentMerge branch 'po/remote-set-head-usage' (diff)
parenthowto/revert-a-faulty-merge: fix unescaped '^'s (diff)
downloadtgif-865156a7cb72a579c144220204fd7b447ca4e50f.tar.xz
Merge branch 'rj/doc-formatting-fix'
* rj/doc-formatting-fix: howto/revert-a-faulty-merge: fix unescaped '^'s howto/setup-git-server-over-http: fix unescaped '^'s
Diffstat (limited to 'rerere.h')
0 files changed, 0 insertions, 0 deletions