summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano2014-10-243-28/+26
* builtin/merge.c: drop a parameter that is never usedJunio C Hamano2014-10-241-2/+2
* git-tag.txt: Add a missing hyphen to `-s`Wieland Hoffmann2014-10-071-1/+1
* Documentation: fix missing text for rev-parse --verifybrian m. carlson2014-07-221-1/+1
* annotate: use argv_arrayRené Scharfe2014-07-161-7/+5
* t7300: repair filesystem permissions with test_when_finishedJeff King2014-07-021-2/+2
* enums: remove trailing ',' after last item in enumRonnie Sahlberg2014-07-022-2/+2
* Git 1.8.5.5v1.8.5.5Junio C Hamano2014-02-135-4/+42
* Merge branch 'bm/merge-base-octopus-dedup' into maintJunio C Hamano2014-02-132-6/+64
|\
| * merge-base --octopus: reduce the result from get_octopus_merge_bases()bm/merge-base-octopus-dedupJunio C Hamano2013-12-302-1/+40
| * merge-base: separate "--independent" codepath into its own helperJunio C Hamano2013-12-301-6/+25
* | Merge branch 'jc/revision-range-unpeel' into maintJunio C Hamano2014-02-132-12/+33
|\ \
| * | revision: propagate flag bits from tags to pointeesjc/revision-range-unpeelJunio C Hamano2014-01-152-6/+13
| * | revision: mark contents of an uninteresting tree uninterestingJunio C Hamano2014-01-152-8/+23
* | | Merge branch 'jk/allow-fetch-onelevel-refname' into maintJunio C Hamano2014-02-132-1/+12
|\ \ \
| * | | fetch-pack: do not filter out one-level refsjk/allow-fetch-onelevel-refnameJeff King2014-01-152-1/+12
| | |/ | |/|
* | | Merge branch 'jk/interpret-branch-name-fix' into maintJunio C Hamano2014-02-133-45/+124
|\ \ \
| * | | interpret_branch_name: find all possible @-marksjk/interpret-branch-name-fixJeff King2014-01-152-9/+32
| * | | interpret_branch_name: avoid @{upstream} past colonJeff King2014-01-152-0/+19
| * | | interpret_branch_name: always respect "namelen" parameterJeff King2014-01-152-8/+24
| * | | interpret_branch_name: rename "cp" variable to "at"Jeff King2014-01-151-5/+5
| * | | interpret_branch_name: factor out upstream handlingJeff King2014-01-151-31/+52
* | | | Merge branch 'rk/send-email-ssl-cert' into maintJunio C Hamano2014-02-131-1/+2
|\ \ \ \
| * | | | send-email: /etc/ssl/certs/ directory may not be usable as ca_pathrk/send-email-ssl-certRuben Kerkhof2014-01-161-1/+2
| |/ / /
* | | | Merge branch 'sb/repack-in-c' into maintJunio C Hamano2014-02-131-12/+12
|\ \ \ \
| * | | | repack: propagate pack-objects options as stringssb/repack-in-cJeff King2014-01-231-11/+11
| * | | | repack: make parsed string options const-correctJeff King2014-01-231-1/+1
| * | | | repack: fix typo in max-pack-size optionJeff King2014-01-231-1/+1
* | | | | Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maintJunio C Hamano2014-02-132-1/+14
|\ \ \ \ \
| * | | | | tree_entry_interesting: match against all pathspecsas/tree-walk-fix-aggressive-short-cutAndy Spencer2014-01-272-1/+14
| | |_|/ / | |/| | |
* | | | | Git 1.8.5.4v1.8.5.4Junio C Hamano2014-02-054-3/+52
* | | | | Merge branch 'jc/maint-pull-docfix' into maintJunio C Hamano2014-02-052-5/+8
|\ \ \ \ \
| * | | | | Documentation: "git pull" does not have the "-m" optionjc/maint-pull-docfixJunio C Hamano2014-01-141-3/+6
| * | | | | Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfixJunio C Hamano2014-01-141-2/+2
| |\ \ \ \ \
| | * | | | | Documentation: exclude irrelevant options from "git pull"jc/maint-pull-docfix-for-409b8d82Junio C Hamano2014-01-141-2/+2
* | | | | | | Merge branch 'ow/stash-with-ifs' into maintJunio C Hamano2014-02-052-7/+19
|\ \ \ \ \ \ \
| * | | | | | | stash: handle specifying stashes with $IFSow/stash-with-ifsØystein Walle2014-01-072-7/+19
* | | | | | | | Merge branch 'js/lift-parent-count-limit' into maintJunio C Hamano2014-02-054-10/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove the line length limit for graft filesjs/lift-parent-count-limitJohannes Schindelin2013-12-274-10/+45
* | | | | | | | | Merge branch 'nd/add-empty-fix' into maintJunio C Hamano2014-02-052-1/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: don't complain when adding empty project rootnd/add-empty-fixNguyễn Thái Ngọc Duy2013-12-262-1/+20
* | | | | | | | | | Merge branch 'bc/log-decoration' into maintJunio C Hamano2014-02-052-0/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | log: properly handle decorations with chained tagsbc/log-decorationbrian m. carlson2013-12-202-0/+17
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jh/rlimit-nofile-fallback' into maintJunio C Hamano2014-02-051-7/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failurejh/rlimit-nofile-fallbackJunio C Hamano2013-12-181-7/+30
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jl/commit-v-strip-marker' into maintJunio C Hamano2014-02-054-9/+58
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit -v: strip diffs and submodule shortlogs from the commit messagejl/commit-v-strip-markerJens Lehmann2013-12-054-9/+58
* | | | | | | | | | | Merge branch 'tr/send-email-ssl' into maintJunio C Hamano2014-02-051-2/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | send-email: set SSL options through IO::Socket::SSL::set_client_defaultstr/send-email-sslThomas Rast2013-12-041-2/+5
| * | | | | | | | | | | send-email: --smtp-ssl-cert-path takes an argumentThomas Rast2013-12-041-1/+1
View Lorry Controller Status