Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/alias-in-bare' | Junio C Hamano | 2013-03-25 | 1 | -0/+19 |
|\ | |||||
| * | setup: suppress implicit "." work-tree for bare repos | Jeff King | 2013-03-08 | 1 | -0/+19 |
* | | Merge branch 'jc/push-follow-tag' | Junio C Hamano | 2013-03-25 | 1 | -0/+73 |
|\ \ | |||||
| * | | push: --follow-tags | Junio C Hamano | 2013-03-05 | 1 | -0/+73 |
* | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' | Junio C Hamano | 2013-03-25 | 1 | -0/+54 |
|\ \ \ | |||||
| * | | | tests: make sure rename pretty print works | Antoine Pelisse | 2013-03-06 | 1 | -0/+54 |
* | | | | Merge branch 'jl/submodule-deinit' | Junio C Hamano | 2013-03-25 | 1 | -0/+100 |
|\ \ \ \ | |||||
| * | | | | submodule: add 'deinit' command | Jens Lehmann | 2013-03-04 | 1 | -0/+100 |
* | | | | | Merge branch 'pe/pull-rebase-v-q' | Junio C Hamano | 2013-03-25 | 1 | -0/+27 |
|\ \ \ \ \ | |||||
| * | | | | | pull: Apply -q and -v options to rebase mode as well | Peter Eisentraut | 2013-03-16 | 1 | -0/+27 |
* | | | | | | Merge branch 'we/submodule-update-prefix-output' | Junio C Hamano | 2013-03-21 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule update: when using recursion, show full path | William Entriken | 2013-03-03 | 1 | -1/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'rs/zip-compresssed-size-with-export-subst' | Junio C Hamano | 2013-03-21 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | archive-zip: fix compressed size for stored export-subst files | René Scharfe | 2013-02-27 | 1 | -0/+6 |
* | | | | | | | Merge branch 'rt/commit-cleanup-config' | Junio C Hamano | 2013-03-21 | 1 | -8/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7502: perform commits using alternate editor in a subshell | Brandon Casey | 2013-02-23 | 1 | -8/+16 |
* | | | | | | | | Merge branch 'nd/branch-error-cases' | Junio C Hamano | 2013-03-21 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | branch: segfault fixes and validation | Nguyễn Thái Ngọc Duy | 2013-02-23 | 1 | -0/+21 |
* | | | | | | | | | Merge branch 'da/difftool-fixes' | Junio C Hamano | 2013-03-21 | 1 | -199/+169 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t7800: "defaults" is no longer a builtin tool name | David Aguilar | 2013-02-21 | 1 | -2/+2 |
| * | | | | | | | | | t7800: modernize tests | David Aguilar | 2013-02-20 | 1 | -198/+168 |
| * | | | | | | | | | t7800: update copyright notice | David Aguilar | 2013-02-19 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'bc/commit-complete-lines-given-via-m-option' | Junio C Hamano | 2013-03-21 | 1 | -4/+12 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-commit: only append a newline to -m mesg if necessary | Brandon Casey | 2013-02-19 | 1 | -1/+1 |
| * | | | | | | | | | | t7502: demonstrate breakage with a commit message with trailing newlines | Brandon Casey | 2013-02-19 | 1 | -3/+11 |
| * | | | | | | | | | | t/t7502: compare entire commit message with what was expected | Brandon Casey | 2013-02-19 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch 'nd/count-garbage' | Junio C Hamano | 2013-03-21 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | count-objects: report garbage files in pack directory too | Nguyễn Thái Ngọc Duy | 2013-02-15 | 1 | -0/+26 |
* | | | | | | | | | | | | Merge branch 'jc/fetch-raw-sha1' | Junio C Hamano | 2013-03-21 | 1 | -0/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fetch: fetch objects by their exact SHA-1 object names | Junio C Hamano | 2013-02-07 | 1 | -0/+34 |
* | | | | | | | | | | | | | Merge branch 'tb/document-status-u-tradeoff' | Junio C Hamano | 2013-03-21 | 3 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | status: advise to consider use of -u when read_directory takes too long | Nguyễn Thái Ngọc Duy | 2013-03-16 | 3 | -0/+3 |
* | | | | | | | | | | | | | | Merge branch 'jc/add-2.0-u-A-sans-pathspec' (early part) | Junio C Hamano | 2013-03-19 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t2200: check that "add -u" limits itself to subdirectory | Jeff King | 2013-03-14 | 1 | -0/+16 |
* | | | | | | | | | | | | | | | Merge branch 'da/downcase-u-in-usage' | Junio C Hamano | 2013-03-19 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | tests: use a lowercase "usage:" string | David Aguilar | 2013-02-24 | 2 | -2/+2 |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-17 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | t1507: Test that branchname@{upstream} is interpreted as branch | Kacper Kornet | 2013-03-17 | 1 | -0/+4 |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | perf: update documentation of GIT_PERF_REPEAT_COUNT | Antoine Pelisse | 2013-03-09 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'mh/maint-ceil-absolute' into maint | Junio C Hamano | 2013-03-07 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Sync with 1.8.1.5 | Junio C Hamano | 2013-03-01 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Make !pattern in .gitattributes non-fatal | Thomas Rast | 2013-03-01 | 1 | -1/+2 |
* | | | | | | | | | | | | | Merge branch 'mh/maint-ceil-absolute' | Junio C Hamano | 2013-02-27 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Provide a mechanism to turn off symlink resolution in ceiling paths | Michael Haggerty | 2013-02-22 | 1 | -0/+17 |
* | | | | | | | | | | | | | Sync with 'maint' | Junio C Hamano | 2013-02-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'sp/smart-http-content-type-check' into maint | Junio C Hamano | 2013-02-25 | 4 | -0/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/combine-diff-many-parents' into maint | Junio C Hamano | 2013-02-25 | 1 | -0/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Documentation: "advice" is uncountable | Greg Price | 2013-02-25 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Merge branch 'mz/pick-unborn' into maint | Junio C Hamano | 2013-02-07 | 9 | -40/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |