summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/objc-funchdr'Shawn O. Pearce2008-10-092-0/+12
|\
| * Teach git diff about Objective-C syntaxJonathan del Strother2008-10-062-0/+12
* | Merge branch 'pb/gitweb'Shawn O. Pearce2008-10-092-31/+187
|\ \
| * \ Merge branch 'pb/gitweb-tagcloud' into pb/gitwebShawn O. Pearce2008-10-0338-169/+447
| |\ \
| | * | gitweb: Support for simple project search formPetr Baudis2008-10-032-2/+14
| | * | gitweb: Make the by_tag filter delve in forks as wellPetr Baudis2008-10-031-3/+10
| | * | gitweb: Support for tag cloudsPetr Baudis2008-10-031-0/+109
| * | | gitweb: Add support for extending the action bar with custom linksPetr Baudis2008-10-021-1/+34
| * | | gitweb: Sort the list of forks on the summary page by ageMike Ralphson2008-10-011-2/+2
| * | | gitweb: Clean-up sorting of project listPetr Baudis2008-10-011-25/+20
* | | | Merge branch 'dm/svn-branch'Shawn O. Pearce2008-10-093-2/+128
|\ \ \ \
| * | | | Add git-svn branch to allow branch creation in SVN repositoriesFlorian Ragwitz2008-10-063-2/+128
| | |_|/ | |/| |
* | | | Merge branch 'bc/xdiffnl'Shawn O. Pearce2008-10-091-1/+11
|\ \ \ \
| * | | | xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey2008-10-021-1/+11
| | |_|/ | |/| |
* | | | Merge branch 'dp/cywginstat'Shawn O. Pearce2008-10-099-38/+194
|\ \ \ \
| * | | | cygwin: Use native Win32 API for statDmitry Potapov2008-09-305-0/+150
| * | | | mingw: move common functionality to win32.hDmitry Potapov2008-09-302-38/+38
| * | | | add have_git_dir() functionDmitry Potapov2008-09-302-0/+6
* | | | | Merge branch 'lt/time-reject-fractional-seconds'Shawn O. Pearce2008-10-091-6/+20
|\ \ \ \ \
| * | | | | date/time: do not get confused by fractional secondsLinus Torvalds2008-08-171-6/+20
* | | | | | Merge branch 'jc/add-ita'Shawn O. Pearce2008-10-094-6/+65
|\ \ \ \ \ \
| * | | | | | git-add --intent-to-add (-N)Junio C Hamano2008-08-314-6/+65
* | | | | | | Merge branch 'mw/sendemail'Shawn O. Pearce2008-10-093-215/+147
|\ \ \ \ \ \ \
| * | | | | | | bash completion: Add --[no-]validate to "git send-email"Teemu Likonen2008-10-021-1/+2
| * | | | | | | send-email: signedoffcc -> signedoffbycc, but handle bothMichael Witten2008-10-012-5/+6
| * | | | | | | Docs: send-email: Create logical groupings for man textMichael Witten2008-10-011-50/+69
| * | | | | | | Docs: send-email: Create logical groupings for --help textMichael Witten2008-10-011-27/+34
| * | | | | | | Docs: send-email: Remove unnecessary config variable descriptionMichael Witten2008-10-011-75/+16
| * | | | | | | Docs: send-email: --chain_reply_to -> --[no-]chain-reply-toMichael Witten2008-10-011-1/+1
| * | | | | | | send-email: change --no-validate to boolean --[no-]validateMichael Witten2008-10-012-6/+12
| * | | | | | | Docs: send-email: Man page option orderingMichael Witten2008-10-011-72/+66
| * | | | | | | Docs: send-email usage text much sexierMichael Witten2008-10-011-68/+26
| * | | | | | | Docs: send-email's usage text and man page mention same optionsMichael Witten2008-10-012-12/+17
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'mv/merge-refresh'Shawn O. Pearce2008-10-092-0/+19
|\ \ \ \ \ \ \
| * | | | | | | builtin-merge: refresh the index before calling a strategyMiklos Vajna2008-10-032-0/+19
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ph/parseopt'Shawn O. Pearce2008-10-093-80/+74
|\ \ \ \ \ \ \
| * | | | | | | parse-opt: migrate builtin-merge-file.Pierre Habouzit2008-10-021-31/+37
| * | | | | | | parse-opt: migrate git-merge-base.Pierre Habouzit2008-10-021-21/+16
| * | | | | | | parse-opt: migrate fmt-merge-msg.Pierre Habouzit2008-10-021-28/+21
| |/ / / / / /
* | | | | | | Merge branch 'rz/grepz'Shawn O. Pearce2008-10-094-3/+26
|\ \ \ \ \ \ \
| * | | | | | | git grep: Add "-z/--null" option as in GNU's grep.Raphael Zimmerer2008-10-014-3/+26
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mg/verboseprune'Shawn O. Pearce2008-10-092-4/+11
|\ \ \ \ \ \ \
| * | | | | | | make prune report removed objects on -vMichael J Gruber2008-09-302-4/+11
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'maint'Shawn O. Pearce2008-10-095-28/+18
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sg/maint-intrebase-msghook' into maintShawn O. Pearce2008-10-091-6/+11
| |\ \ \ \ \ \ \
| | * | | | | | | rebase -i: remove leftover debuggingSZEDER Gábor2008-10-031-1/+1
| | * | | | | | | rebase -i: proper prepare-commit-msg hook argument when squashingSZEDER Gábor2008-10-021-6/+11
| * | | | | | | | builtin-apply: fix typo leading to stack corruptionImre Deak2008-10-091-1/+1
| * | | | | | | | git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)Brandon Casey2008-10-091-18/+4
| * | | | | | | | Merge branch 'jk/maint-soliconv' into maintShawn O. Pearce2008-10-091-1/+0
| |\ \ \ \ \ \ \ \