summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint' into HEADJunio C Hamano2007-10-306-15/+23
|\
| * Update GIT 1.5.3.5 Release NotesJunio C Hamano2007-10-301-1/+7
| * git-rebase--interactive.sh: Make 3-way merge strategies work for -p.Björn Steinbrink2007-10-301-0/+2
| * git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.Björn Steinbrink2007-10-301-2/+2
| * Fix --strategy parsing in git-rebase--interactive.shBjörn Steinbrink2007-10-301-1/+0
| * Make merge-recursive honor diff.renamelimitLars Hjemli2007-10-301-0/+6
| * cherry-pick/revert: more compact user direction messageNicolas Pitre2007-10-301-1/+1
| * core-tutorial: Use new syntax for git-merge.Sergei Organov2007-10-301-4/+4
| * git-merge: document but discourage the historical syntaxJunio C Hamano2007-10-301-5/+6
| * Prevent send-pack from segfaulting (backport from 'master')Junio C Hamano2007-10-301-1/+4
| * Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in exampleMichael W. Olson2007-10-301-1/+1
* | Merge branch 'nd/worktree' into HEADJunio C Hamano2007-10-301-1/+1
|\ \
| * | git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OKNguyễn Thái Ngọc Duy2007-10-291-1/+1
* | | Merge branch 'cc/skip' into HEADJunio C Hamano2007-10-307-108/+410
|\ \ \
| * | | Bisect: add "skip" to the short usage string.Christian Couder2007-10-291-3/+3
| * | | Bisect run: "skip" current commit if script exit code is 125.Christian Couder2007-10-263-4/+57
| * | | Bisect: add a "bisect replay" test case.Christian Couder2007-10-261-0/+7
| * | | Bisect: add "bisect skip" to the documentation.Christian Couder2007-10-261-2/+17
| * | | Bisect: refactor "bisect_{bad,good,skip}" into "bisect_state".Christian Couder2007-10-261-51/+31
| * | | Bisect: refactor some logging into "bisect_write".Christian Couder2007-10-261-33/+14
| * | | Bisect: refactor "bisect_write_*" functions.Christian Couder2007-10-261-26/+20
| * | | Bisect: implement "bisect skip" to mark untestable revisions.Christian Couder2007-10-262-6/+190
| * | | Bisect: fix some white spaces and empty lines breakages.Christian Couder2007-10-261-9/+8
| * | | rev-list documentation: add "--bisect-all".Christian Couder2007-10-261-0/+16
| * | | rev-list: implement --bisect-allChristian Couder2007-10-263-15/+88
* | | | Merge branch 'jk/send-pack' into HEADJunio C Hamano2007-10-302-16/+62
|\ \ \ \
| * | | | t5516: test update of local refs on pushJeff King2007-10-181-0/+28
| * | | | send-pack: don't update tracking refs on errorJeff King2007-10-181-16/+34
* | | | | Merge branch 'lt/rename' into HEADJunio C Hamano2007-10-306-166/+395
|\ \ \ \ \
| * | | | | Do the fuzzy rename detection limits with the exact renames removedLinus Torvalds2007-10-261-14/+18
| * | | | | Fix ugly magic special case in exact rename detectionLinus Torvalds2007-10-261-13/+14
| * | | | | Do exact rename detection regardless of rename limitsLinus Torvalds2007-10-261-6/+6
| * | | | | Do linear-time/space rename logic for exact renamesLinus Torvalds2007-10-264-65/+303
| * | | | | copy vs rename detection: avoid unnecessary O(n*m) loopsLinus Torvalds2007-10-263-75/+35
| * | | | | Ref-count the filespecs used by diffcoreLinus Torvalds2007-10-263-14/+19
| * | | | | Split out "exact content match" phase of rename detectionLinus Torvalds2007-10-261-34/+56
| * | | | | Add 'diffcore.h' to LIB_HLinus Torvalds2007-10-261-2/+1
* | | | | | Merge branch 'jn/web' into HEADJunio C Hamano2007-10-301-85/+67
|\ \ \ \ \ \
| * | | | | | gitweb: Fix and simplify "split patch" detectionJakub Narebski2007-10-291-85/+67
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ds/gitweb' into HEADJunio C Hamano2007-10-301-8/+29
|\ \ \ \ \ \
| * | | | | | gitweb: Use chop_and_escape_str in more places.David Symonds2007-10-241-3/+3
| * | | | | | gitweb: Refactor abbreviation-with-title-attribute code.David Symonds2007-10-241-24/+21
| * | | | | | gitweb: Provide title attributes for abbreviated author names.David Symonds2007-10-221-5/+29
* | | | | | | Merge branch 'js/rebase' into HEADJunio C Hamano2007-10-301-13/+13
|\ \ \ \ \ \ \
| * | | | | | | Fixing path quoting in git-rebaseJonathan del Strother2007-10-181-13/+13
| | |_|_|/ / / | |/| | | | |
* | | | | | | No longer install git-svnimport, move to contrib/examplesGerrit Pape2007-10-306-5/+1
| |_|/ / / / |/| | | | |
* | | | | | Correct handling of upload-pack in builtin-fetch-packDaniel Barkalow2007-10-291-3/+4
* | | | | | Speedup scanning for excluded files.Lars Knoll2007-10-292-16/+50
* | | | | | RelNotes-1.5.4: describe recent updatesJunio C Hamano2007-10-292-2/+27
* | | | | | Teach git-pull about --[no-]ff, --no-squash and --commitLars Hjemli2007-10-291-3/+11
View Lorry Controller Status