diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-03-28 14:17:17 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-03-28 14:17:17 -0700 |
commit | 61e8aaf6215a2983610a770645e6d0a24bafb454 (patch) | |
tree | dafb753af176f0303e7a65f775004c38c85f08f2 /Documentation/git-merge-tree.txt | |
parent | tests: fix overeager scrubbing of environment variables (diff) | |
parent | git tag documentation grammar fixes and readability updates (diff) | |
download | tgif-61e8aaf6215a2983610a770645e6d0a24bafb454.tar.xz |
Merge branch 'maint'
* maint:
git tag documentation grammar fixes and readability updates
grep: Add the option '--line-number'
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions