summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-03 20:53:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-03 20:53:11 (GMT)
commit44bc573436c98b7c6cd798af04c538f6e76f0f6e (patch)
treec4dbc1ac7a92ef12098c0e7676ed1ee41a8f60f0 /git-pull.sh
parent485cdb9bd8bd7de6c7099c1c3e9c6fca6a60fdd3 (diff)
parent8e848868fff625a8dda92fb11edf2b7975827e1a (diff)
downloadgit-44bc573436c98b7c6cd798af04c538f6e76f0f6e.zip
git-44bc573436c98b7c6cd798af04c538f6e76f0f6e.tar.gz
git-44bc573436c98b7c6cd798af04c538f6e76f0f6e.tar.bz2
Merge branch 'maint'
* maint: Start preparing for 1.7.4.4 pull: do not clobber untracked files on initial pull compat: add missing #include <sys/resource.h> Conflicts: RelNotes
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions