diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-02 12:02:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-02 12:02:16 -0700 |
| commit | 9d52f15af7de943779cf6302cef4f1a88ce447be (patch) | |
| tree | 53c0f1a56674b66491cd0e6942fca82b5a1968e9 /ll-merge.h | |
| parent | 8a883b0260ba7f8d6e4c025ae3c32b454e80ade5 (diff) | |
| parent | 7d808125a0197e5660a57f77d14937604b16e39a (diff) | |
| download | git-9d52f15af7de943779cf6302cef4f1a88ce447be.tar.gz git-9d52f15af7de943779cf6302cef4f1a88ce447be.tar.xz | |
Merge branch 'maint'
* maint:
test-lib: Remove 3 year old no-op --no-python option
test-lib: Ignore --quiet under a TAP harness
Documentation/rev-parse: quoting is required with --parseopt
Documentation: reporting bugs
Fix git rebase --continue to work with touched files
Document ls-files -t as semi-obsolete.
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions