summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-05-19 23:25:59 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-19 23:25:59 -0700
commit2be2e267aaae6f7b77a820591463b7888b30cbc3 (patch)
treedd0bc1c022d89966e4519283faa029d77e8af05a /merge-file.c
parentgit-svn: don't minimize-url when doing an init that tracks multiple paths (diff)
parentuser-manual: Add section on ignoring files (diff)
downloadtgif-2be2e267aaae6f7b77a820591463b7888b30cbc3.tar.xz
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
* 'maint' of git://linux-nfs.org/~bfields/git: user-manual: Add section on ignoring files user-manual: finding commits referencing given file content user-manual: discourage shared repository tutorial: revise index introduction tutorials: add user-manual links
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions