summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* push: fix english in non-fast-forward messageJeff King2009-09-061-1/+1
* Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-09-034-24/+28
|\
| * Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2009-09-033-4/+8
| |\
| | * git-clone: add missing comma in --reference documentationMiklos Vajna2009-09-031-1/+1
| | * clone: disconnect transport after fetchingJeff King2009-09-022-3/+7
| * | git-cvsserver: no longer use deprecated 'git-subcommand' commandsGerrit Pape2009-09-021-20/+20
* | | GIT 1.6.4.2v1.6.4.2Junio C Hamano2009-08-294-3/+36
* | | Remove unused t/t8005/iso8859-5.txtNanako Shiraishi2009-08-291-2/+0
* | | Merge branch 'rc/maint-http-fix' into maintJunio C Hamano2009-08-281-1/+3
|\ \ \
| * | | http.c: don't assume that urls don't end with slashTay Ray Chuan2009-08-181-1/+3
* | | | http.c: set slot callback members to NULL when releasing objectTay Ray Chuan2009-08-281-1/+6
* | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-274-4/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2009-08-274-4/+4
| |\ \ \ | | | |/ | | |/|
| | * | Fix overridable written with an extra 'e'Nanako Shiraishi2009-08-272-2/+2
| | * | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-08-271-1/+1
| | |\ \
| | | * \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-08-271-1/+1
| | | |\ \
| | | | * | Documentation: git-archive: mark --format as optional in summaryWesley J. Landaker2009-08-271-1/+1
| | | | * | Merge branch 'maint-1.5.6' into maint-1.6.0Junio C Hamano2009-08-272-2/+43
| | | | |\ \
| | * | | | | Round-down years in "years+months" relative date viewDavid Reiss2009-08-271-1/+1
* | | | | | | git-log: allow --decorate[=short|full]Lars Hjemli2009-08-269-10/+65
* | | | | | | Minor improvement to the write-tree documentationDavid Kågedal2009-08-261-1/+2
* | | | | | | git-bisect: call the found commit "*the* first bad commit"Nanako Shiraishi2009-08-263-11/+11
* | | | | | | Merge branch 'js/maint-cover-letter-non-ascii' into maintJunio C Hamano2009-08-264-12/+17
|\ \ \ \ \ \ \
| * | | | | | | Correctly mark cover letters' encodings if they are not pure ASCIIJohannes Schindelin2009-08-101-0/+4
| * | | | | | | Expose the has_non_ascii() functionJohannes Schindelin2009-08-103-12/+13
* | | | | | | | Merge branch 'jc/maint-clean-nested-dir-safety' into maintJunio C Hamano2009-08-266-5/+63
|\ \ \ \ \ \ \ \
| * | | | | | | | clean: require double -f options to nuke nested git repository and work treeJunio C Hamano2009-07-296-5/+63
* | | | | | | | | Merge branch 'jk/maint-merge-msg-fix' into maintJunio C Hamano2009-08-264-11/+75
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: indicate remote tracking branches in merge messageJeff King2009-08-093-1/+16
| * | | | | | | | | merge: fix incorrect merge message for ambiguous tag/branchJeff King2009-08-093-11/+10
| * | | | | | | | | add tests for merge message headingsJeff King2009-08-091-0/+50
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/apply-epoch-patch' into maintJunio C Hamano2009-08-262-1/+176
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | apply: notice creation/removal patches produced by GNU diffJunio C Hamano2009-07-112-1/+176
* | | | | | | | | | Merge branch 'jp/symlink-dirs' into maintJunio C Hamano2009-08-264-1/+114
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t6035-merge-dir-to-symlink depends on SYMLINKS prerequisiteJohannes Sixt2009-08-091-0/+6
| * | | | | | | | | | git-checkout: be careful about untracked symlinksLinus Torvalds2009-07-293-2/+18
| * | | | | | | | | | lstat_cache: guard against full match of length of 'name' parameterKjetil Barvik2009-07-292-1/+5
| * | | | | | | | | | Demonstrate bugs when a directory is replaced with a symlinkPickens, James E2009-07-291-0/+87
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-262-0/+15
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3Junio C Hamano2009-08-262-0/+15
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | add -p: do not attempt to coalesce mode changesThomas Rast2009-08-152-1/+5
| | * | | | | | | | | git add -p: demonstrate failure when staging both mode and hunkKirill Smelkov2009-08-151-0/+11
* | | | | | | | | | | GIT 1.6.4.1v1.6.4.1Junio C Hamano2009-08-214-3/+50
* | | | | | | | | | | Merge branch 'bc/maint-am-email' into maintJunio C Hamano2009-08-212-1/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-am: print fair error message when format detection failsNicolas Sebrecht2009-08-101-1/+5
| * | | | | | | | | | | am: allow individual e-mail files as inputJunio C Hamano2009-08-102-0/+29
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/maint-merge-recursive-fix' into maintJunio C Hamano2009-08-212-3/+80
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-recursive: don't segfault while handling rename clashesJunio C Hamano2009-07-302-3/+80
* | | | | | | | | | | | Merge branch 'zf/maint-gitweb-acname' into maintJunio C Hamano2009-08-211-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb: parse_commit_text encoding fixZoltán Füzesi2009-08-051-3/+2
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |