summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mk/combine-diff-context-horizon-fix'Junio C Hamano2013-06-022-2/+53
|\
| * combine-diff.c: Fix output when changes are exactly 3 lines apartMatthijs Kooijman2013-05-152-2/+53
* | Merge branch 'kb/ancestry-path-threedots'Junio C Hamano2013-06-023-1/+38
|\ \
| * | revision.c: treat A...B merge bases as if manually specifiedKevin Bracey2013-05-163-1/+19
| * | t6019: demonstrate --ancestry-path A...B breakageKevin Bracey2013-05-131-1/+20
* | | Merge branch 'jc/t5551-posix-sed-bre'Junio C Hamano2013-06-021-2/+6
|\ \ \
| * | | t5551: do not use unportable sed '\+'Junio C Hamano2013-05-121-2/+6
* | | | Merge branch 'da/darwin'Junio C Hamano2013-06-022-0/+25
|\ \ \ \
| * | | | imap-send: eliminate HMAC deprecation warnings on Mac OS XDavid Aguilar2013-05-211-0/+10
| * | | | cache.h: eliminate SHA-1 deprecation warnings on Mac OS XDavid Aguilar2013-05-201-0/+6
| * | | | Makefile: add support for Apple CommonCrypto facilityDavid Aguilar2013-05-201-0/+8
| * | | | Makefile: fix default regex settings on DarwinDavid Aguilar2013-05-111-0/+1
* | | | | Merge branch 'fc/macos-x-clipped-write'Junio C Hamano2013-06-024-0/+27
|\ \ \ \ \
| * | | | | compate/clipped-write.c: large write(2) fails on Mac OS X/XNUFilipe Cabecinhas2013-05-174-0/+27
* | | | | | Merge branch 'vv/help-unknown-ref'Junio C Hamano2013-06-023-1/+57
|\ \ \ \ \ \
| * | | | | | merge: use help_unknown_ref()Vikrant Varma2013-05-081-1/+2
| * | | | | | help: add help_unknown_ref()Vikrant Varma2013-05-082-0/+55
* | | | | | | Merge branch 'nd/clone-local-with-colon'Junio C Hamano2013-06-024-2/+18
|\ \ \ \ \ \ \
| * | | | | | | clone: allow cloning local paths with colons in themNguyễn Thái Ngọc Duy2013-05-074-2/+18
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fc/fast-export-persistent-marks'Junio C Hamano2013-06-022-8/+16
|\ \ \ \ \ \ \
| * | | | | | | fast-{import,export}: use get_sha1_hex() to read from marks fileFelipe Contreras2013-05-072-2/+2
| * | | | | | | fast-export: don't parse commits while reading marks fileFelipe Contreras2013-05-071-1/+6
| * | | | | | | fast-export: do not parse non-commit objects while reading marks fileFelipe Contreras2013-05-071-6/+9
* | | | | | | | Merge branch 'rs/empty-archive'Junio C Hamano2013-06-022-0/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | t5004: resurrect original empty tar archive testRené Scharfe2013-05-092-0/+14
| * | | | | | | | t5004: avoid using tar for checking emptiness of archiveRené Scharfe2013-05-091-3/+2
* | | | | | | | | Merge branch 'rh/merge-options-doc-fix'Junio C Hamano2013-06-021-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/merge-options.txt: restore `-e` optionRichard Hansen2013-05-161-1/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'an/diff-index-doc'Junio C Hamano2013-06-021-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/diff-index: mention two modes of operationJunio C Hamano2013-05-201-6/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fc/completion'Junio C Hamano2013-06-022-115/+107
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | completion: remove __git_index_file_list_filter()Felipe Contreras2013-04-271-20/+8
| * | | | | | | | | completion: add space after completed filenameFelipe Contreras2013-04-271-1/+1
| * | | | | | | | | completion: add hack to enable file mode in bash < 4Felipe Contreras2013-04-271-36/+7
| * | | | | | | | | completion: refactor __git_complete_index_file()Felipe Contreras2013-04-271-6/+3
| * | | | | | | | | completion: refactor diff_index wrappersFelipe Contreras2013-04-271-55/+16
| * | | | | | | | | completion: use __gitcompadd for __gitcomp_fileFelipe Contreras2013-04-271-1/+1
| * | | | | | | | | completion; remove unuseful commentsFelipe Contreras2013-04-271-2/+0
| * | | | | | | | | completion: document tilde expansion failure in testsFelipe Contreras2013-04-271-0/+9
| * | | | | | | | | completion: add file completion testsFelipe Contreras2013-04-271-0/+68
* | | | | | | | | | Merge branch 'fc/zsh-leftover-bits'Junio C Hamano2013-06-022-23/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | completion: zsh: improve bash script loadingFelipe Contreras2013-05-291-8/+19
| * | | | | | | | | | completion: synchronize zsh wrapperFelipe Contreras2013-05-081-2/+2
| * | | | | | | | | | completion: cleanup zsh wrapperFelipe Contreras2013-05-081-13/+5
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Sync with maintJunio C Hamano2013-05-291-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Start 1.8.3.1 maintenance trackJunio C Hamano2013-05-291-1/+1
| * | | | | | | | | | Merge branch 'maint-1.8.2' into maintJunio C Hamano2013-05-291-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | trivial: Add missing period in documentationPhil Hord2013-05-281-1/+1
| | | |_|/ / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Start 1.8.4 cycleJunio C Hamano2013-05-294-5/+78
* | | | | | | | | | | Merge branch 'jn/config-ignore-inaccessible'Junio C Hamano2013-05-295-15/+22
|\ \ \ \ \ \ \ \ \ \ \