Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | alloc_ref_from_str(): factor out a common pattern of alloc_ref from string | Krzysztof Kowalczyk | 2008-05-11 | 6 | -27/+19 |
* | Merge branch 'maint' | Junio C Hamano | 2008-05-08 | 2 | -2/+5 |
|\ | |||||
| * | Merge branch 'maint-1.5.4' into maint | Junio C Hamano | 2008-05-08 | 2 | -2/+5 |
| |\ | |||||
| | * | Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull" | Dustin Sallings | 2008-05-08 | 1 | -1/+2 |
| | * | doc: clarify definition of "update" for git-add -u | Jeff King | 2008-05-08 | 1 | -1/+3 |
* | | | Merge branch 'sg/merge-options' (early part) | Junio C Hamano | 2008-05-08 | 11 | -81/+186 |
|\ \ \ | |||||
| * | | | merge, pull: add '--(no-)log' command line option | SZEDER Gábor | 2008-04-12 | 5 | -7/+36 |
| * | | | fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable | SZEDER Gábor | 2008-04-12 | 4 | -13/+75 |
| * | | | add 'merge.stat' config variable | SZEDER Gábor | 2008-04-12 | 3 | -1/+6 |
| * | | | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 2008-04-12 | 6 | -21/+40 |
| * | | | doc: moved merge.* config variables into separate merge-config.txt | SZEDER Gábor | 2008-04-12 | 3 | -43/+33 |
* | | | | Merge branch 'db/learn-HEAD' | Junio C Hamano | 2008-05-08 | 10 | -29/+79 |
|\ \ \ \ | |||||
| * | | | | Make ls-remote http://... list HEAD, like for git://... | Daniel Barkalow | 2008-04-26 | 5 | -2/+43 |
| * | | | | Make walker.fetch_ref() take a struct ref. | Daniel Barkalow | 2008-04-26 | 6 | -27/+36 |
* | | | | | Merge branch 'jn/webfeed' | Junio C Hamano | 2008-05-08 | 2 | -25/+104 |
|\ \ \ \ \ | |||||
| * | | | | | gitweb: Use feed link according to current view | Jakub Narebski | 2008-04-26 | 2 | -25/+104 |
| |/ / / / | |||||
* | | | | | Merge branch 'cc/help' | Junio C Hamano | 2008-05-08 | 4 | -28/+233 |
|\ \ \ \ \ | |||||
| * | | | | | documentation: web--browse: add a note about konqueror | Christian Couder | 2008-04-26 | 1 | -1/+23 |
| * | | | | | documentation: help: add info about "man.<tool>.cmd" config var | Christian Couder | 2008-04-26 | 2 | -5/+48 |
| * | | | | | help: use "man.<tool>.cmd" as custom man viewer command | Christian Couder | 2008-04-26 | 1 | -18/+40 |
| * | | | | | documentation: help: add "man.<tool>.path" config variable | Christian Couder | 2008-04-26 | 2 | -0/+13 |
| * | | | | | help: use man viewer path from "man.<tool>.path" config var | Christian Couder | 2008-04-26 | 1 | -19/+124 |
| |/ / / / | |||||
* | | | | | Merge branch 'dm/cherry-pick-s' | Junio C Hamano | 2008-05-08 | 3 | -7/+23 |
|\ \ \ \ \ | |||||
| * | | | | | Allow cherry-pick (and revert) to add signoff line | Dan McGee | 2008-04-26 | 3 | -7/+23 |
| |/ / / / | |||||
* | | | | | Merge branch 'lt/dirmatch-optim' | Junio C Hamano | 2008-05-08 | 1 | -2/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Optimize match_pathspec() to avoid fnmatch() | Linus Torvalds | 2008-04-26 | 1 | -2/+20 |
| |/ / / / | |||||
* | | | | | compat-util: avoid macro redefinition warning | Johannes Sixt | 2008-05-08 | 1 | -0/+3 |
* | | | | | compat/fopen.c: avoid clobbering the system defined fopen macro | Brandon Casey | 2008-05-08 | 1 | -1/+12 |
* | | | | | Documentation: bisect: add a few "git bisect run" examples | Christian Couder | 2008-05-08 | 1 | -0/+49 |
* | | | | | Documentation/config.txt: Add git-gui options | Gustaf Hendeby | 2008-05-08 | 1 | -0/+30 |
* | | | | | Documentation: improve "add", "pull" and "format-patch" examples | Christian Couder | 2008-05-06 | 3 | -69/+108 |
* | | | | | Be more careful with objects directory permissions on clone | Mark Hills | 2008-05-06 | 1 | -1/+4 |
* | | | | | Merge branch 'jc/lstat' | Junio C Hamano | 2008-05-05 | 2 | -3/+6 |
|\ \ \ \ \ | |||||
| * | | | | | diff-files: mark an index entry we know is up-to-date as such | Junio C Hamano | 2008-04-12 | 1 | -2/+5 |
| * | | | | | write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE | Junio C Hamano | 2008-04-12 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'bc/filter-branch' | Junio C Hamano | 2008-05-05 | 3 | -6/+58 |
|\ \ \ \ \ | |||||
| * | | | | | filter-branch.sh: support nearly proper tag name filtering | Brandon Casey | 2008-03-31 | 3 | -6/+58 |
* | | | | | | Merge branch 'lh/git-file' | Junio C Hamano | 2008-05-05 | 8 | -7/+174 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Teach GIT-VERSION-GEN about the .git file | Lars Hjemli | 2008-04-09 | 1 | -1/+1 |
| * | | | | | | Teach git-submodule.sh about the .git file | Lars Hjemli | 2008-04-09 | 1 | -2/+2 |
| * | | | | | | Teach resolve_gitlink_ref() about the .git file | Lars Hjemli | 2008-04-09 | 1 | -3/+14 |
| * | | | | | | Add platform-independent .git "symlink" | Lars Hjemli | 2008-04-09 | 5 | -1/+157 |
* | | | | | | | Merge branch 'jk/fetch-status' | Junio C Hamano | 2008-05-05 | 1 | -3/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-fetch: always show status of non-tracking-ref fetches | Jeff King | 2008-04-10 | 1 | -3/+1 |
* | | | | | | | | Merge branch 'lh/branch-merged' | Junio C Hamano | 2008-05-05 | 3 | -3/+80 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add tests for `branch --[no-]merged` | Lars Hjemli | 2008-04-20 | 1 | -1/+41 |
| * | | | | | | | | git-branch.txt: compare --contains, --merged and --no-merged | Lars Hjemli | 2008-04-20 | 1 | -0/+21 |
| * | | | | | | | | git-branch: add support for --merged and --no-merged | Lars Hjemli | 2008-04-20 | 2 | -2/+18 |
* | | | | | | | | | Merge branch 'pb/remote-mirror-config' | Junio C Hamano | 2008-05-05 | 8 | -36/+104 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add a remote.*.mirror configuration option | Paolo Bonzini | 2008-04-20 | 8 | -36/+104 |
| |/ / / / / / / / |