Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mk/combine-diff-context-horizon-fix' | Junio C Hamano | 2013-06-02 | 2 | -2/+53 |
|\ | |||||
| * | combine-diff.c: Fix output when changes are exactly 3 lines apart | Matthijs Kooijman | 2013-05-15 | 2 | -2/+53 |
* | | Merge branch 'kb/ancestry-path-threedots' | Junio C Hamano | 2013-06-02 | 3 | -1/+38 |
|\ \ | |||||
| * | | revision.c: treat A...B merge bases as if manually specified | Kevin Bracey | 2013-05-16 | 3 | -1/+19 |
| * | | t6019: demonstrate --ancestry-path A...B breakage | Kevin Bracey | 2013-05-13 | 1 | -1/+20 |
* | | | Merge branch 'jc/t5551-posix-sed-bre' | Junio C Hamano | 2013-06-02 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | t5551: do not use unportable sed '\+' | Junio C Hamano | 2013-05-12 | 1 | -2/+6 |
* | | | | Merge branch 'da/darwin' | Junio C Hamano | 2013-06-02 | 2 | -0/+25 |
|\ \ \ \ | |||||
| * | | | | imap-send: eliminate HMAC deprecation warnings on Mac OS X | David Aguilar | 2013-05-21 | 1 | -0/+10 |
| * | | | | cache.h: eliminate SHA-1 deprecation warnings on Mac OS X | David Aguilar | 2013-05-20 | 1 | -0/+6 |
| * | | | | Makefile: add support for Apple CommonCrypto facility | David Aguilar | 2013-05-20 | 1 | -0/+8 |
| * | | | | Makefile: fix default regex settings on Darwin | David Aguilar | 2013-05-11 | 1 | -0/+1 |
* | | | | | Merge branch 'fc/macos-x-clipped-write' | Junio C Hamano | 2013-06-02 | 4 | -0/+27 |
|\ \ \ \ \ | |||||
| * | | | | | compate/clipped-write.c: large write(2) fails on Mac OS X/XNU | Filipe Cabecinhas | 2013-05-17 | 4 | -0/+27 |
* | | | | | | Merge branch 'vv/help-unknown-ref' | Junio C Hamano | 2013-06-02 | 3 | -1/+57 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: use help_unknown_ref() | Vikrant Varma | 2013-05-08 | 1 | -1/+2 |
| * | | | | | | help: add help_unknown_ref() | Vikrant Varma | 2013-05-08 | 2 | -0/+55 |
* | | | | | | | Merge branch 'nd/clone-local-with-colon' | Junio C Hamano | 2013-06-02 | 4 | -2/+18 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | clone: allow cloning local paths with colons in them | Nguyễn Thái Ngọc Duy | 2013-05-07 | 4 | -2/+18 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fc/fast-export-persistent-marks' | Junio C Hamano | 2013-06-02 | 2 | -8/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fast-{import,export}: use get_sha1_hex() to read from marks file | Felipe Contreras | 2013-05-07 | 2 | -2/+2 |
| * | | | | | | | fast-export: don't parse commits while reading marks file | Felipe Contreras | 2013-05-07 | 1 | -1/+6 |
| * | | | | | | | fast-export: do not parse non-commit objects while reading marks file | Felipe Contreras | 2013-05-07 | 1 | -6/+9 |
* | | | | | | | | Merge branch 'rs/empty-archive' | Junio C Hamano | 2013-06-02 | 2 | -0/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t5004: resurrect original empty tar archive test | René Scharfe | 2013-05-09 | 2 | -0/+14 |
| * | | | | | | | | t5004: avoid using tar for checking emptiness of archive | René Scharfe | 2013-05-09 | 1 | -3/+2 |
* | | | | | | | | | Merge branch 'rh/merge-options-doc-fix' | Junio C Hamano | 2013-06-02 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation/merge-options.txt: restore `-e` option | Richard Hansen | 2013-05-16 | 1 | -1/+2 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'an/diff-index-doc' | Junio C Hamano | 2013-06-02 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation/diff-index: mention two modes of operation | Junio C Hamano | 2013-05-20 | 1 | -6/+6 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'fc/completion' | Junio C Hamano | 2013-06-02 | 2 | -115/+107 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | completion: remove __git_index_file_list_filter() | Felipe Contreras | 2013-04-27 | 1 | -20/+8 |
| * | | | | | | | | | completion: add space after completed filename | Felipe Contreras | 2013-04-27 | 1 | -1/+1 |
| * | | | | | | | | | completion: add hack to enable file mode in bash < 4 | Felipe Contreras | 2013-04-27 | 1 | -36/+7 |
| * | | | | | | | | | completion: refactor __git_complete_index_file() | Felipe Contreras | 2013-04-27 | 1 | -6/+3 |
| * | | | | | | | | | completion: refactor diff_index wrappers | Felipe Contreras | 2013-04-27 | 1 | -55/+16 |
| * | | | | | | | | | completion: use __gitcompadd for __gitcomp_file | Felipe Contreras | 2013-04-27 | 1 | -1/+1 |
| * | | | | | | | | | completion; remove unuseful comments | Felipe Contreras | 2013-04-27 | 1 | -2/+0 |
| * | | | | | | | | | completion: document tilde expansion failure in tests | Felipe Contreras | 2013-04-27 | 1 | -0/+9 |
| * | | | | | | | | | completion: add file completion tests | Felipe Contreras | 2013-04-27 | 1 | -0/+68 |
* | | | | | | | | | | Merge branch 'fc/zsh-leftover-bits' | Junio C Hamano | 2013-06-02 | 2 | -23/+26 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | completion: zsh: improve bash script loading | Felipe Contreras | 2013-05-29 | 1 | -8/+19 |
| * | | | | | | | | | | completion: synchronize zsh wrapper | Felipe Contreras | 2013-05-08 | 1 | -2/+2 |
| * | | | | | | | | | | completion: cleanup zsh wrapper | Felipe Contreras | 2013-05-08 | 1 | -13/+5 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Sync with maint | Junio C Hamano | 2013-05-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Start 1.8.3.1 maintenance track | Junio C Hamano | 2013-05-29 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'maint-1.8.2' into maint | Junio C Hamano | 2013-05-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | trivial: Add missing period in documentation | Phil Hord | 2013-05-28 | 1 | -1/+1 |
| | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
* | | | | | | | | | | | Start 1.8.4 cycle | Junio C Hamano | 2013-05-29 | 4 | -5/+78 |
* | | | | | | | | | | | Merge branch 'jn/config-ignore-inaccessible' | Junio C Hamano | 2013-05-29 | 5 | -15/+22 |
|\ \ \ \ \ \ \ \ \ \ \ |