Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/fix-diff-files-unmerged' into maint | Junio C Hamano | 2011-05-13 | 16 | -36/+120 |
|\ | |||||
| * | diff-files: show unmerged entries correctly | Junio C Hamano | 2011-04-23 | 2 | -2/+95 |
| * | diff: remove often unused parameters from diff_unmerge() | Junio C Hamano | 2011-04-23 | 3 | -11/+6 |
| * | diff.c: return filepair from diff_unmerge() | Junio C Hamano | 2011-04-23 | 2 | -6/+9 |
| * | 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 | 2 | -2/+67 |
|\ \ | |||||
| * | | diffcore-rename: don't consider unmerged path as source | Martin von Zweigbergk | 2011-03-23 | 2 | -2/+67 |
* | | | t5400: Fix a couple of typos | Johan Herland | 2011-05-13 | 1 | -2/+2 |
* | | | Remove duplicated "is a" | João Britto | 2011-05-05 | 1 | -1/+1 |
* | | | t3701: fix here document | Junio C Hamano | 2011-05-05 | 1 | -3/+2 |
* | | | git-fast-import.txt: --relative-marks takes no parameter | Michael J Gruber | 2011-05-05 | 1 | -2/+2 |
* | | | shell: add missing initialization of argv0_path | Dima Sharov | 2011-05-05 | 1 | -0/+2 |
* | | | Git 1.7.5.1v1.7.5.1 | Junio C Hamano | 2011-05-04 | 3 | -2/+36 |
* | | | Merge branch 'jh/dirstat' into maint | Junio C Hamano | 2011-05-04 | 8 | -12/+81 |
|\ \ \ | |||||
| * | | | --dirstat: In case of renames, use target filename instead of source filename | Johan Herland | 2011-04-12 | 1 | -1/+1 |
| * | | | Teach --dirstat not to completely ignore rearranged lines within a file | Johan Herland | 2011-04-11 | 4 | -5/+21 |
| * | | | --dirstat-by-file: Make it faster and more correct | Johan Herland | 2011-04-11 | 3 | -5/+25 |
| * | | | --dirstat: Describe non-obvious differences relative to --stat or regular diff | Johan Herland | 2011-04-11 | 6 | -7/+40 |
* | | | | Merge branch 'sp/maint-clear-postfields' into maint | Junio C Hamano | 2011-05-04 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | http: clear POSTFIELDS when initializing a slot | Junio C Hamano | 2011-04-26 | 1 | -0/+1 |
* | | | | | Merge branch 'jk/maint-stash-oob' into maint | Junio C Hamano | 2011-05-04 | 2 | -16/+12 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | 2 | -11/+7 |
* | | | | | | Merge branch 'jk/maint-upload-pack-shallow' into maint | Junio C Hamano | 2011-05-04 | 1 | -12/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | upload-pack: start pack-objects before async rev-list | Jeff King | 2011-04-06 | 1 | -12/+11 |
* | | | | | | | Merge branch 'dm/stash-k-i-p' into maint | Junio C Hamano | 2011-05-04 | 3 | -4/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | stash: ensure --no-keep-index and --patch can be used in any order | Dan McGee | 2011-04-07 | 2 | -5/+6 |
| * | | | | | | | stash: add two more tests for --no-keep-index | Dan McGee | 2011-04-07 | 2 | -0/+20 |
* | | | | | | | | Merge branch 'jc/pack-objects-bigfile' into maint | Junio C Hamano | 2011-05-04 | 6 | -9/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Teach core.bigfilethreashold to pack-objects | Junio C Hamano | 2011-04-05 | 6 | -9/+14 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'mg/reflog-with-options' into maint | Junio C Hamano | 2011-05-04 | 2 | -13/+35 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | reflog: fix overriding of command line options | Michael J Gruber | 2011-04-01 | 2 | -8/+3 |
| * | | | | | | | | t/t1411: test reflog with formats | Michael J Gruber | 2011-04-01 | 1 | -0/+18 |
| * | | | | | | | | builtin/log.c: separate default and setup of cmd_log_init() | Michael J Gruber | 2011-04-01 | 1 | -6/+15 |
* | | | | | | | | | Merge branch 'jk/stash-loosen-safety' into maint | Junio C Hamano | 2011-05-04 | 2 | -7/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | stash: drop dirty worktree check on apply | Jeff King | 2011-04-06 | 2 | -7/+17 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ar/clean-rmdir-empty' into maint | Junio C Hamano | 2011-05-04 | 2 | -1/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | clean: unreadable directory may still be rmdir-able if it is empty | Alex Riesen | 2011-04-01 | 2 | -1/+8 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mg/sha1-path-advise' into maint | Junio C Hamano | 2011-05-04 | 2 | -9/+19 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | sha1_name: Suggest commit:./file for path in subdir | Michael J Gruber | 2011-04-03 | 2 | -5/+8 |
| * | | | | | | | | | t1506: factor out test for "Did you mean..." | Michael J Gruber | 2011-04-03 | 1 | -5/+12 |
* | | | | | | | | | | git-add.txt: document 'add.ignoreErrors' | Valentin Haenel | 2011-05-04 | 1 | -0/+2 |
* | | | | | | | | | | Start 1.7.5.1 maintenance track | Junio C Hamano | 2011-04-29 | 2 | -1/+15 |
* | | | | | | | | | | Merge branch 'mg/x-years-12-months' into maint | Junio C Hamano | 2011-04-29 | 2 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | date: avoid "X years, 12 months" in relative dates | Michael J Gruber | 2011-04-20 | 2 | -2/+4 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | git-send-email: fix missing space in error message | Sylvain Rabot | 2011-04-29 | 1 | -1/+1 |
* | | | | | | | | | | Git 1.7.5v1.7.5 | Junio C Hamano | 2011-04-23 | 2 | -1/+6 |
* | | | | | | | | | | Git 1.7.5-rc3v1.7.5-rc3 | Junio C Hamano | 2011-04-19 | 3 | -9/+4 |
* | | | | | | | | | | Sync with 1.7.4.5 | Junio C Hamano | 2011-04-19 | 2 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Git 1.7.4.5v1.7.4.5 | Junio C Hamano | 2011-04-19 | 3 | -2/+6 |