Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/fix-diff-files-unmerged' into maint | Junio C Hamano | 2011-05-13 | 13 | -22/+102 |
|\ | |||||
| * | diff-files: show unmerged entries correctly | Junio C Hamano | 2011-04-23 | 1 | -0/+87 |
| * | test: use $_z40 from test-lib | Junio C Hamano | 2011-04-23 | 12 | -22/+15 |
* | | Merge branch 'mz/maint-rename-unmerged' into maint | Junio C Hamano | 2011-05-13 | 1 | -0/+62 |
|\ \ | |||||
| * | | diffcore-rename: don't consider unmerged path as source | Martin von Zweigbergk | 2011-03-23 | 1 | -0/+62 |
* | | | t5400: Fix a couple of typos | Johan Herland | 2011-05-13 | 1 | -2/+2 |
* | | | t3701: fix here document | Junio C Hamano | 2011-05-05 | 1 | -3/+2 |
* | | | Merge branch 'jh/dirstat' into maint | Junio C Hamano | 2011-05-04 | 6 | -7/+40 |
|\ \ \ | |||||
| * | | | Teach --dirstat not to completely ignore rearranged lines within a file | Johan Herland | 2011-04-11 | 2 | -2/+1 |
| * | | | --dirstat-by-file: Make it faster and more correct | Johan Herland | 2011-04-11 | 2 | -0/+5 |
| * | | | --dirstat: Describe non-obvious differences relative to --stat or regular diff | Johan Herland | 2011-04-11 | 5 | -7/+36 |
* | | | | Merge branch 'jk/maint-stash-oob' into maint | Junio C Hamano | 2011-05-04 | 1 | -5/+11 |
|\ \ \ \ | |||||
| * | | | | stash: fix false positive in the invalid ref test. | Jon Seymour | 2011-04-05 | 1 | -5/+5 |
| * | | | | stash: fix accidental apply of non-existent stashes | Jeff King | 2011-04-05 | 1 | -0/+6 |
* | | | | | Merge branch 'dm/stash-k-i-p' into maint | Junio C Hamano | 2011-05-04 | 2 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | stash: ensure --no-keep-index and --patch can be used in any order | Dan McGee | 2011-04-07 | 1 | -1/+1 |
| * | | | | | stash: add two more tests for --no-keep-index | Dan McGee | 2011-04-07 | 2 | -0/+20 |
* | | | | | | Merge branch 'mg/reflog-with-options' into maint | Junio C Hamano | 2011-05-04 | 1 | -0/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | reflog: fix overriding of command line options | Michael J Gruber | 2011-04-01 | 1 | -1/+1 |
| * | | | | | | t/t1411: test reflog with formats | Michael J Gruber | 2011-04-01 | 1 | -0/+18 |
* | | | | | | | Merge branch 'jk/stash-loosen-safety' into maint | Junio C Hamano | 2011-05-04 | 1 | -4/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | stash: drop dirty worktree check on apply | Jeff King | 2011-04-06 | 1 | -4/+16 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ar/clean-rmdir-empty' into maint | Junio C Hamano | 2011-05-04 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | clean: unreadable directory may still be rmdir-able if it is empty | Alex Riesen | 2011-04-01 | 1 | -0/+7 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mg/sha1-path-advise' into maint | Junio C Hamano | 2011-05-04 | 1 | -5/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sha1_name: Suggest commit:./file for path in subdir | Michael J Gruber | 2011-04-03 | 1 | -1/+1 |
| * | | | | | | | t1506: factor out test for "Did you mean..." | Michael J Gruber | 2011-04-03 | 1 | -5/+12 |
* | | | | | | | | Merge branch 'mg/x-years-12-months' into maint | Junio C Hamano | 2011-04-29 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | date: avoid "X years, 12 months" in relative dates | Michael J Gruber | 2011-04-20 | 1 | -0/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-04-14 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t3306,t5304: avoid clock skew issues | Michael J Gruber | 2011-04-14 | 2 | -1/+5 |
| * | | | | | | | | Merge branch 'js/checkout-untracked-symlink' into maint | Junio C Hamano | 2011-04-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'nm/maint-conflicted-submodule-entries' into maint | Junio C Hamano | 2011-04-06 | 1 | -6/+52 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pull: do not clobber untracked files on initial pull | Jeff King | 2011-04-03 | 1 | -0/+11 |
| * | | | | | | | | | Merge branch 'jc/maint-rev-list-culled-boundary' into maint | Junio C Hamano | 2011-04-03 | 1 | -0/+27 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mm/maint-log-n-with-diff-filtering' into maint | Junio C Hamano | 2011-04-03 | 4 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/format-patch-multiline-header' into maint | Junio C Hamano | 2011-04-03 | 1 | -0/+84 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'lp/config-vername-check' into maint | Junio C Hamano | 2011-04-03 | 1 | -4/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'pk/stash-apply-status-relative' into maint | Junio C Hamano | 2011-04-01 | 1 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-diff-q-filter' into maint | Junio C Hamano | 2011-04-01 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/maint-do-not-track-non-branches' into maint | Junio C Hamano | 2011-04-01 | 3 | -15/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/checkout-untracked-symlink' into maint | Junio C Hamano | 2011-04-01 | 2 | -3/+61 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "checkout ambiguous ref bugfix" into maint | Junio C Hamano | 2011-04-01 | 1 | -0/+59 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'js/checkout-untracked-symlink' | Junio C Hamano | 2011-04-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | t2021: mark a test as fixed | Johannes Sixt | 2011-04-12 | 1 | -1/+1 |
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'nd/init-gitdir' | Junio C Hamano | 2011-04-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | t0001: guard a new test with SYMLINKS prerequisite | Johannes Sixt | 2011-04-11 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-remote-mirror-safer' | Junio C Hamano | 2011-04-06 | 1 | -0/+78 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | remote: separate the concept of push and fetch mirrors | Jeff King | 2011-03-30 | 1 | -0/+78 |
* | | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-fetch-on-demand' | Junio C Hamano | 2011-04-04 | 3 | -1/+276 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |