Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' | Junio C Hamano | 2009-04-07 | 4 | -5/+29 |
|\ | |||||
| * | match_tree_entry(): a pathspec only matches at directory boundaries | Junio C Hamano | 2009-04-01 | 2 | -2/+12 |
| * | tree_entry_interesting: a pathspec only matches at directory boundary | Björn Steinbrink | 2009-04-01 | 2 | -3/+17 |
* | | Merge branch 'ms/http-auth' | Junio C Hamano | 2009-04-07 | 3 | -0/+50 |
|\ \ | |||||
| * | | Allow curl to rewind the read buffers | Martin Storsjö | 2009-04-02 | 3 | -0/+50 |
* | | | Merge branch 'js/maint-submodule-checkout' | Junio C Hamano | 2009-04-07 | 2 | -3/+42 |
|\ \ \ | |||||
| * | | | Fix 'git checkout <submodule>' to update the index | Johannes Schindelin | 2009-04-02 | 2 | -3/+42 |
* | | | | Merge branch 'cb/maint-merge-recursive-submodule-fix' | Junio C Hamano | 2009-04-07 | 2 | -12/+78 |
|\ \ \ \ | |||||
| * | | | | simplify output of conflicting merge | Clemens Buchacher | 2009-04-05 | 1 | -13/+4 |
| * | | | | update cache for conflicting submodule entries | Clemens Buchacher | 2009-04-05 | 2 | -3/+4 |
| * | | | | add tests for merging with submodules | Clemens Buchacher | 2009-04-05 | 1 | -0/+74 |
* | | | | | Merge branch 'mh/html-path' | Junio C Hamano | 2009-04-07 | 5 | -3/+22 |
|\ \ \ \ \ | |||||
| * | | | | | add --html-path to get the location of installed HTML docs | Markus Heidelberg | 2009-04-04 | 5 | -3/+22 |
* | | | | | | git-rev-list.txt: make ascii markup uniform with other pages. | Matthieu Moy | 2009-04-07 | 1 | -11/+11 |
* | | | | | | git-send-email.txt: clarify which options take an argument. | Matthieu Moy | 2009-04-07 | 1 | -17/+17 |
* | | | | | | Merge branch 'jc/name-branch' | Junio C Hamano | 2009-04-06 | 11 | -50/+94 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't permit ref/branch names to end with ".lock" | Shawn O. Pearce | 2009-03-24 | 2 | -0/+5 |
| * | | | | | | check_ref_format(): tighten refname rules | Junio C Hamano | 2009-03-24 | 3 | -7/+28 |
| * | | | | | | strbuf_check_branch_ref(): a helper to check a refname for a branch | Junio C Hamano | 2009-03-22 | 6 | -17/+17 |
| * | | | | | | Fix branch -m @{-1} newname | Junio C Hamano | 2009-03-22 | 1 | -7/+7 |
| * | | | | | | check-ref-format --branch: give Porcelain a way to grok branch shorthand | Junio C Hamano | 2009-03-22 | 2 | -0/+22 |
| * | | | | | | strbuf_branchname(): a wrapper for branch name shorthands | Junio C Hamano | 2009-03-22 | 6 | -22/+18 |
| * | | | | | | Rename interpret/substitute nth_last_branch functions | Junio C Hamano | 2009-03-22 | 6 | -11/+11 |
* | | | | | | | Merge branch 'jc/shared-literally' | Junio C Hamano | 2009-04-06 | 10 | -38/+97 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t1301: loosen test for forced modes | Jeff King | 2009-04-01 | 1 | -2/+2 |
| * | | | | | | | set_shared_perm(): sometimes we know what the final mode bits should look like | Junio C Hamano | 2009-03-28 | 3 | -11/+19 |
| * | | | | | | | move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath | Junio C Hamano | 2009-03-28 | 1 | -2/+3 |
| * | | | | | | | Move chmod(foo, 0444) into move_temp_to_file() | Johan Herland | 2009-03-27 | 5 | -11/+4 |
| * | | | | | | | "core.sharedrepository = 0mode" should set, not loosen | Junio C Hamano | 2009-03-27 | 5 | -20/+77 |
* | | | | | | | | Merge branch 'mg/tracked-local-branches' | Junio C Hamano | 2009-04-06 | 2 | -3/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make local branches behave like remote branches when --tracked | Michael J Gruber | 2009-04-01 | 2 | -3/+6 |
| * | | | | | | | | Test for local branches being followed with --track | Michael J Gruber | 2009-03-27 | 1 | -1/+9 |
* | | | | | | | | | Merge branch 'sb/format-patch-patchname' | Junio C Hamano | 2009-04-06 | 17 | -129/+381 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | format_sanitized_subject: Don't trim past initial length of strbuf | Stephen Boyd | 2009-04-01 | 1 | -2/+4 |
| * | | | | | | | | | log-tree: fix patch filename computation in "git format-patch" | Christian Couder | 2009-03-27 | 1 | -10/+5 |
| * | | | | | | | | | format-patch: --numbered-files and --stdout aren't mutually exclusive | Stephen Boyd | 2009-03-22 | 2 | -1/+171 |
| * | | | | | | | | | format-patch: --attach/inline uses filename instead of SHA1 | Stephen Boyd | 2009-03-22 | 14 | -44/+112 |
| * | | | | | | | | | format-patch: move get_patch_filename() into log-tree | Stephen Boyd | 2009-03-22 | 3 | -24/+26 |
| * | | | | | | | | | format-patch: pass a commit to reopen_stdout() | Stephen Boyd | 2009-03-22 | 1 | -28/+39 |
| * | | | | | | | | | format-patch: construct patch filename in one function | Stephen Boyd | 2009-03-22 | 1 | -65/+33 |
| * | | | | | | | | | pretty.c: add %f format specifier to format_commit_message() | Stephen Boyd | 2009-03-22 | 2 | -0/+36 |
* | | | | | | | | | | user-manual: the name of the hash function is SHA-1, not sha1 | Felipe Contreras | 2009-04-06 | 1 | -25/+25 |
* | | | | | | | | | | docbook: change css style | Felipe Contreras | 2009-04-06 | 1 | -2/+12 |
* | | | | | | | | | | user-manual: remove some git-foo usage | Felipe Contreras | 2009-04-06 | 1 | -74/+74 |
* | | | | | | | | | | Documentation: branch.*.merge can also affect 'git-push' | Santi Béjar | 2009-04-06 | 1 | -1/+1 |
* | | | | | | | | | | Add configuration variable for sign-off to format-patch | Heiko Voigt | 2009-04-06 | 3 | -7/+24 |
* | | | | | | | | | | bash completion: Update 'git am' options | Todd Zullinger | 2009-04-05 | 1 | -1/+2 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-04-05 | 4 | -5/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git submodule: fix usage line | Julien Danjou | 2009-04-05 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-05 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ |