diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-05 19:30:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 19:30:23 (GMT) |
| commit | 1e7ea4e7abe6214a06d8acd60e6f6e2a09f7d05c (patch) | |
| tree | bd98fb3b7d11937c4eb6ce593675237537def24b /Documentation/git-merge.txt | |
| parent | 6560584494a8053431d0c8e90b78d50f71c8055b (diff) | |
| parent | ac179b4d9ceb460ca0b6bc77806b54b8e7dc3dd4 (diff) | |
| download | git-1e7ea4e7abe6214a06d8acd60e6f6e2a09f7d05c.zip git-1e7ea4e7abe6214a06d8acd60e6f6e2a09f7d05c.tar.gz git-1e7ea4e7abe6214a06d8acd60e6f6e2a09f7d05c.tar.bz2 | |
Merge branch 'jw/make-arflags-customizable'
The Makefile always runs the library archiver with hardcoded "crs"
options, which was inconvenient for exotic platforms on which
people want to use programs with totally different set of command
line options.
* jw/make-arflags-customizable:
Makefile: allow $(ARFLAGS) specified from the command line
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions