summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-13 11:21:06 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-13 11:21:06 -0700
commit95e42a64a9e713bcc3c4590fb933c93d37342322 (patch)
tree4bf5b47c3b098bf4848313350888bb24d3ab93e0 /Documentation/git-pull.txt
parentce987457ca3db0c78d5e720f753adf210fd3dd65 (diff)
parent1a3eb9a0325fc1d1d168b517210b7760d31d3022 (diff)
downloadgit-95e42a64a9e713bcc3c4590fb933c93d37342322.tar.gz
Merge branch 'jn/notes-doc'
* jn/notes-doc: Documentation/notes: nitpicks Documentation/notes: clean up description of rewriting configuration Documentation/notes: simplify treatment of default display refs Documentation/log: add a CONFIGURATION section Documentation/notes: simplify treatment of default notes ref Documentation/notes: add configuration section Documentation/notes: describe content of notes blobs Documentation/notes: document format of notes trees
Diffstat (limited to 'Documentation/git-pull.txt')
0 files changed, 0 insertions, 0 deletions