diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:34:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:34:18 -0800 |
| commit | 51f737e350c79ddf45616fa023692fa557363434 (patch) | |
| tree | d399f9592e1847372c87f91fbb62cec93b45092f /notes-merge.c | |
| parent | Merge branch 'master' of git://bogomips.org/git-svn (diff) | |
| parent | Merge branch 'maint-1.7.7' into maint (diff) | |
| download | git-51f737e350c79ddf45616fa023692fa557363434.tar.gz git-51f737e350c79ddf45616fa023692fa557363434.zip | |
Merge branch 'maint'
* maint:
am: don't persist keepcr flag
mingw: give waitpid the correct signature
git symbolic-ref: documentation fix
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions