diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-01 10:37:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-01 10:37:40 -0800 |
| commit | 1d38c6971dd1a4b054d90b7ae4c9de5400b9d818 (patch) | |
| tree | 18b58df3d3d53a4f55c6ca73fd57fc4bafa1295c /t/t6037-merge-ours-theirs.sh | |
| parent | Documentation/githooks: Fix linkgit (diff) | |
| parent | user-manual: Flesh out uncommitted changes and submodule updates (diff) | |
| download | tgif-1d38c6971dd1a4b054d90b7ae4c9de5400b9d818.tar.xz | |
Merge branch 'wk/user-manual' into maint
* wk/user-manual:
user-manual: Flesh out uncommitted changes and submodule updates
user-manual: Use request-pull to generate "please pull" text
user-manual: Reorganize the reroll sections, adding 'git rebase -i'
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions