diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-25 11:18:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-25 11:18:39 -0700 |
| commit | 340a6b58da21442492650f0e1d7e25be5253c677 (patch) | |
| tree | 669451af9482ef69d7710065648799dcbcd8d1b3 /diff.c | |
| parent | 87412ec1f17bc2705595ebabc010d94cb46478b7 (diff) | |
| parent | cd5320f25228b4c3bbef2391df2696dca09d3d46 (diff) | |
| download | git-340a6b58da21442492650f0e1d7e25be5253c677.tar.gz | |
Merge branch 'sb/maint-rebase' into maint
* sb/maint-rebase:
git-rebase.sh: Add check if rebase is in progress
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions