summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'jh/graph-next-line'Junio C Hamano2010-08-182-23/+55
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enable custom schemes for column colors in the graph APIJohan Herland2010-07-132-11/+43
| * | | | | | | | | | Make graph_next_line() available in the graph.h APIJohan Herland2010-07-132-12/+12
* | | | | | | | | | | Merge branch 'tr/xsize-bits'Junio C Hamano2010-08-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | xsize_t: check whether we lose bitsThomas Rast2010-07-281-0/+2
* | | | | | | | | | | | Merge branch 'tc/checkout-B'Junio C Hamano2010-08-184-9/+218
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | builtin/checkout: handle -B from detached HEAD correctlyTay Ray Chuan2010-08-092-1/+7
| * | | | | | | | | | | | builtin/checkout: learn -BTay Ray Chuan2010-06-253-7/+88
| * | | | | | | | | | | | builtin/checkout: reword hint for -bTay Ray Chuan2010-06-251-1/+2
| * | | | | | | | | | | | add tests for checkout -bTay Ray Chuan2010-06-251-0/+121
* | | | | | | | | | | | | mergetool: Skip autoresolved pathsDavid Aguilar2010-08-172-17/+57
* | | | | | | | | | | | | git-svn: fix fetch with deleted tagDavid D. Kilzer2010-08-153-2/+99
* | | | | | | | | | | | | git-svn: fix regex to remove "tail" from svn tagsDavid D. Kilzer2010-08-151-1/+1
* | | | | | | | | | | | | Merge branch 'jc/sha1-name-find-fix'Junio C Hamano2010-08-121-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sha1_name.c: fix parsing of ":/token" syntaxJunio C Hamano2010-08-021-10/+11
* | | | | | | | | | | | | | Merge branch 'jn/doc-pull'Junio C Hamano2010-08-121-11/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Documentation: flesh out “git pull” descriptionJonathan Nieder2010-08-021-11/+54
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jn/maint-gitweb-dynconf'Junio C Hamano2010-08-121-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | gitweb: allow configurations that change with each requestJonathan Nieder2010-08-021-4/+4
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'bc/use-more-hardlinks-in-install'Junio C Hamano2010-08-121-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Makefile: make hard/symbolic links for non-builtins tooBrandon Casey2010-07-251-3/+6
| * | | | | | | | | | | | | | Makefile: link builtins residing in bin directory to main git binary tooBrandon Casey2010-07-251-0/+6
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'tr/rfc-reset-doc'Junio C Hamano2010-08-121-169/+178
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Documentation/reset: move "undo permanently" example behind "make topic"Thomas Rast2010-07-191-13/+13
| * | | | | | | | | | | | | | Documentation/reset: reorder examples to match descriptionThomas Rast2010-07-191-23/+23
| * | | | | | | | | | | | | | Documentation/reset: promote 'examples' one section upThomas Rast2010-07-191-107/+109
| * | | | | | | | | | | | | | Documentation/reset: separate options by modeThomas Rast2010-07-191-26/+33
| * | | | | | | | | | | | | | Documentation/git-reset: reorder modes for soft-mixed-hard progressionThomas Rast2010-07-191-6/+6
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jn/parse-date-basic'Junio C Hamano2010-08-122-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Export parse_date_basic() to convert a date string to timestampJonathan Nieder2010-07-152-8/+7
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'sp/fix-smart-http-deadlock-on-error'Junio C Hamano2010-08-121-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | smart-http: Don't deadlock on server failureShawn O. Pearce2010-08-061-2/+3
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-08-128-13/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | push: mention "git pull" in error message for non-fast forwardsMatthieu Moy2010-08-121-2/+2
| * | | | | | | | | | | | | | Standardize do { ... } while (0) styleJonathan Nieder2010-08-124-10/+10
| * | | | | | | | | | | | | | t/t7003: replace \t with literal tab in sed expressionBrandon Casey2010-08-121-1/+1
| * | | | | | | | | | | | | | index-pack: Don't follow replace refs.Nelson Elhage2010-08-122-0/+8
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-08-116-7/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | post-receive-email: remove spurious commas in email subjectMatthieu Moy2010-08-111-1/+1
| * | | | | | | | | | | | | | fast-import: export correctly marks larger than 2^20-1Raja R Harinath2010-08-112-1/+58
| * | | | | | | | | | | | | | t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATHÆvar Arnfjörð Bjarmason2010-08-111-3/+2
| * | | | | | | | | | | | | | diff: strip extra "/" when stripping prefixJakub Narebski2010-08-112-2/+69
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-08-0917-41/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | gitweb: clarify search results page when no matching commit foundJonathan Nieder2010-08-091-4/+5
| * | | | | | | | | | | | | | Documentation: add a FILES section for show-refJonathan Nieder2010-08-091-1/+7
| * | | | | | | | | | | | | | Makefile: add missing dependency on http.hJonathan Nieder2010-08-091-1/+1
| * | | | | | | | | | | | | | Makefile: add missing dependencies on url.hJonathan Nieder2010-08-091-0/+1
| * | | | | | | | | | | | | | Documentation/git-log: Clarify --full-diffMichael J Gruber2010-08-091-0/+3
| * | | | | | | | | | | | | | git-rebase: fix typo when parsing --force-rebaseWilly Tarreau2010-08-091-1/+1
| * | | | | | | | | | | | | | imap-send: Fix sprintf usageÆvar Arnfjörð Bjarmason2010-08-091-4/+8
View Lorry Controller Status