Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sg/merge-options' (early part) | Junio C Hamano | 2008-05-08 | 2 | -8/+85 |
|\ | |||||
| * | merge, pull: add '--(no-)log' command line option | SZEDER Gábor | 2008-04-12 | 1 | -1/+15 |
| * | fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable | SZEDER Gábor | 2008-04-12 | 1 | -3/+51 |
| * | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 2008-04-12 | 1 | -4/+19 |
* | | Merge branch 'bc/filter-branch' | Junio C Hamano | 2008-05-05 | 1 | -0/+32 |
|\ \ | |||||
| * | | filter-branch.sh: support nearly proper tag name filtering | Brandon Casey | 2008-03-31 | 1 | -0/+32 |
* | | | Merge branch 'lh/git-file' | Junio C Hamano | 2008-05-05 | 1 | -0/+103 |
|\ \ \ | |||||
| * | | | Add platform-independent .git "symlink" | Lars Hjemli | 2008-04-09 | 1 | -0/+103 |
* | | | | Merge branch 'lh/branch-merged' | Junio C Hamano | 2008-05-05 | 1 | -1/+41 |
|\ \ \ \ | |||||
| * | | | | Add tests for `branch --[no-]merged` | Lars Hjemli | 2008-04-20 | 1 | -1/+41 |
* | | | | | Merge branch 'pb/remote-mirror-config' | Junio C Hamano | 2008-05-05 | 1 | -1/+40 |
|\ \ \ \ \ | |||||
| * | | | | | Add a remote.*.mirror configuration option | Paolo Bonzini | 2008-04-20 | 1 | -1/+40 |
| |/ / / / | |||||
* | | | | | Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh | Alex Riesen | 2008-04-29 | 1 | -2/+2 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2008-04-27 | 1 | -0/+26 |
|\ \ \ \ \ | |||||
| * | | | | | clone: detect and fail on excess parameters | Junio C Hamano | 2008-04-27 | 1 | -0/+26 |
* | | | | | | Merge branch 'ho/shared' | Junio C Hamano | 2008-04-25 | 1 | -0/+50 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make core.sharedRepository more generic | Heikki Orsila | 2008-04-16 | 1 | -0/+50 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-04-24 | 3 | -13/+118 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | remote: create fetch config lines with '+' | Jeff King | 2008-04-24 | 1 | -0/+10 |
| * | | | | | | push: allow unqualified dest refspecs to DWIM | Jeff King | 2008-04-24 | 1 | -0/+40 |
| * | | | | | | Merge branch 'maint-1.5.4' into maint | Junio C Hamano | 2008-04-24 | 2 | -13/+68 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | t5516: remove ambiguity test (1) | Jeff King | 2008-04-23 | 1 | -13/+1 |
| | * | | | | | | write-tree: properly detect failure to write tree objects | Junio C Hamano | 2008-04-23 | 1 | -0/+67 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-04-23 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'maint-1.5.4' into maint | Junio C Hamano | 2008-04-22 | 1 | -0/+8 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | gitattributes: Fix subdirectory attributes specified from root directory | Matthew Ogilvie | 2008-04-22 | 1 | -0/+8 |
| * | | | | | | Merge branch 'jc/maint-rebase-am' into maint | Junio C Hamano | 2008-04-19 | 1 | -0/+41 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'py/submodule' | Junio C Hamano | 2008-04-19 | 2 | -0/+147 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | builtin-status: Add tests for submodule summary | Ping Yin | 2008-04-12 | 1 | -0/+134 |
| * | | | | | | | | git-submodule summary: --for-status option | Ping Yin | 2008-04-12 | 1 | -0/+13 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/maint-rebase-am' | Junio C Hamano | 2008-04-19 | 1 | -0/+41 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | rebase: do not munge commit log message | Junio C Hamano | 2008-04-16 | 1 | -0/+41 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-04-18 | 2 | -0/+22 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | gitweb: Fix 'history' view for deleted files with history | Jakub Narebski | 2008-04-18 | 1 | -0/+16 |
| * | | | | | | git-remote: reject adding remotes with invalid names | Jonas Fonseca | 2008-04-18 | 1 | -0/+6 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-04-16 | 1 | -1/+6 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'maint-1.5.4' into maint | Junio C Hamano | 2008-04-16 | 1 | -1/+6 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | git-bisect: make "start", "good" and "skip" succeed or fail atomically | Christian Couder | 2008-04-16 | 1 | -1/+6 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-04-14 | 1 | -2/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | git clean: Add test to verify directories aren't removed with a prefix | Shawn Bohrer | 2008-04-14 | 1 | -2/+3 |
* | | | | | | Fix git_config_bool_or_int | Junio C Hamano | 2008-04-13 | 1 | -0/+58 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge branch 'maint' | Junio C Hamano | 2008-04-12 | 2 | -5/+5 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | t7401: squelch garbage output | Junio C Hamano | 2008-04-12 | 1 | -1/+1 |
| * | | | | Fix config key miscount in url.*.insteadOf | Daniel Barkalow | 2008-04-12 | 1 | -4/+4 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2008-04-11 | 1 | -0/+13 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'maint-1.5.4' into maint | Junio C Hamano | 2008-04-11 | 1 | -0/+13 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | bisect: fix bad rev checking in "git bisect good" | Christian Couder | 2008-04-11 | 1 | -0/+13 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2008-04-10 | 1 | -1/+14 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | Merge branch 'maint-1.5.4' into maint | Junio C Hamano | 2008-04-10 | 1 | -1/+14 |
| |\ \ \ | | |/ / | |||||
| | * | | git-archive: ignore prefix when checking file attribute | René Scharfe | 2008-04-10 | 1 | -1/+14 |