diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-13 01:01:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-13 01:01:14 -0700 |
| commit | 9ecb2a7f496413b9a6404e4a19f7edee029819b8 (patch) | |
| tree | e3eced2223d90e82a673a33b84618e78e07ceffd /builtin-merge.c | |
| parent | 77abcbdc268d048b7a19af405607fb8d14e630ed (diff) | |
| parent | 6ff9ae9f97101c30897332f608f35ad232b1faf2 (diff) | |
| download | git-9ecb2a7f496413b9a6404e4a19f7edee029819b8.tar.gz git-9ecb2a7f496413b9a6404e4a19f7edee029819b8.tar.xz | |
Merge branch 'maint'
* maint:
git-stash documentation: mention default options for 'list'
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions