summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-09-08attr: "binary" attribute should choose built-in "binary" merge driverLibravatar Junio C Hamano3-3/+3
2012-09-08merge: teach -Xours/-Xtheirs to binary ll-merge driverLibravatar Junio C Hamano3-7/+35
2012-04-26Git 1.7.9.7Libravatar Junio C Hamano3-2/+16
2012-04-26Sync with 1.7.8.6Libravatar Junio C Hamano4-3/+40
2012-04-26Git 1.7.8.6Libravatar Junio C Hamano4-3/+27
2012-04-26Sync with 1.7.7.7Libravatar Junio C Hamano3-2/+16
2012-04-26Git 1.7.7.7Libravatar Junio C Hamano4-3/+18
2012-04-26bundle: remove stray single-quote from error messageLibravatar Jonathan Nieder1-1/+1
2012-04-10Merge branch 'maint-1.7.8' into maint-1.7.9Libravatar Junio C Hamano2-6/+6
2012-04-09Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8Libravatar Junio C Hamano1-4/+4
2012-04-09Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8Libravatar Junio C Hamano1-2/+2
2012-04-09Merge branch 'tr/cache-tree' into maint-1.7.8Libravatar Junio C Hamano10-11/+142
2012-04-09Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8Libravatar Junio C Hamano2-4/+33
2012-04-09Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8Libravatar Junio C Hamano1-6/+6
2012-04-09Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8Libravatar Junio C Hamano2-23/+36
2012-04-09Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8Libravatar Junio C Hamano5-51/+67
2012-04-09Merge branch 'ph/rerere-doc' into maint-1.7.8Libravatar Junio C Hamano1-7/+12
2012-04-02Git 1.7.9.6Libravatar Junio C Hamano4-4/+18
2012-04-02Merge branch 'jc/maint-merge-autoedit' into maintLibravatar Junio C Hamano2-3/+40
2012-03-30string-list: document that string_list_insert() inserts unique stringsLibravatar Heiko Voigt1-1/+3
2012-03-26Git 1.7.9.5Libravatar Junio C Hamano4-3/+27
2012-03-26Merge branch 'jn/maint-fast-import-empty-ls' into maintLibravatar Junio C Hamano2-0/+43
2012-03-26Merge branch 'ph/rerere-doc' into maintLibravatar Junio C Hamano1-7/+12
2012-03-26Merge branch 'ms/maint-config-error-at-eol-linecount' into maintLibravatar Junio C Hamano2-4/+40
2012-03-26grep doc: add --break / --heading / -W to synopsisLibravatar Mark Lodato1-0/+2
2012-03-26Documentation: improve description of GIT_EDITOR and preference orderLibravatar Rodrigo Silva (MestreLion)1-0/+6
2012-03-26documentation: fix alphabetic ordered list for git-rebase man pageLibravatar Nelson Benitez Leon1-2/+5
2012-03-23Documentation/gitweb: trivial English fixesLibravatar D Waitzman1-2/+2
2012-03-20Merge branch 'maint-1.7.8' into maintLibravatar Junio C Hamano5-16/+34
2012-03-20merge: backport GIT_MERGE_AUTOEDIT supportLibravatar Junio C Hamano2-3/+40
2012-03-20Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8Libravatar Junio C Hamano1-3/+3
2012-03-20Merge branch 'jc/advise-i18n' into maint-1.7.8Libravatar Junio C Hamano2-12/+20
2012-03-20Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8Libravatar Junio C Hamano2-1/+11
2012-03-15fetch/receive: remove over-pessimistic connectivity checkLibravatar Junio C Hamano1-4/+4
2012-03-12Git 1.7.9.4Libravatar Junio C Hamano4-3/+28
2012-03-12Merge branch 'tr/maint-bundle-boundary' into maintLibravatar Junio C Hamano2-23/+36
2012-03-12Merge branch 'jc/maint-diff-patch-header' into maintLibravatar Junio C Hamano2-86/+111
2012-03-12Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maintLibravatar Junio C Hamano1-8/+8
2012-03-12Merge branch 'jc/am-3-nonstandard-popt' into maintLibravatar Junio C Hamano2-4/+22
2012-03-12config: report errors at the EOL with correct line numberLibravatar Martin Stenberg2-4/+40
2012-03-09fast-import: don't allow 'ls' of path with empty componentsLibravatar Jonathan Nieder2-0/+41
2012-03-09fast-import: leakfix for 'ls' of dirty treesLibravatar Jonathan Nieder1-0/+2
2012-03-08rerere: Document 'rerere remaining'Libravatar Phil Hord1-7/+12
2012-03-06gitweb: Fix fixed string (non-regexp) project searchLibravatar Jakub Narebski1-8/+8
2012-03-06t5704: fix nonportable sed/grep usagesLibravatar Thomas Rast1-2/+2
2012-03-06Merge branch 'maint-1.7.8' into maintLibravatar Junio C Hamano1-0/+3
2012-03-06Merge branch 'maint-1.7.7' into maint-1.7.8Libravatar Junio C Hamano1-0/+3
2012-03-06Document the --histogram diff optionLibravatar Thomas Rast1-0/+3
2012-03-05Git 1.7.9.3Libravatar Junio C Hamano2-2/+3
2012-03-05Merge branch 'jc/doc-merge-options' into maintLibravatar Junio C Hamano1-11/+11
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 00:44:26 +0000