Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nm/submodule-update-force' | Junio C Hamano | 2011-05-02 | 3 | -7/+36 |
|\ | |||||
| * | submodule: Add --force option for git submodule update | Nicolas Morey-Chaisemartin | 2011-04-04 | 3 | -7/+36 |
* | | Merge branch 'jh/notes-add-ui' | Junio C Hamano | 2011-05-02 | 3 | -7/+49 |
|\ \ | |||||
| * | | Make "git notes add" more user-friendly when there are existing notes | Johan Herland | 2011-03-30 | 3 | -7/+49 |
* | | | Merge branch 'nd/maint-setup' | Junio C Hamano | 2011-05-02 | 3 | -45/+34 |
|\ \ \ | |||||
| * | | | Kill off get_relative_cwd() | Nguyễn Thái Ngọc Duy | 2011-03-28 | 2 | -50/+6 |
| * | | | setup: return correct prefix if worktree is '/' | Nguyễn Thái Ngọc Duy | 2011-03-28 | 3 | -3/+36 |
* | | | | Merge branch 'mz/maint-rename-unmerged' | Junio C Hamano | 2011-05-02 | 2 | -2/+67 |
|\ \ \ \ | |||||
| * | | | | diffcore-rename: don't consider unmerged path as source | Martin von Zweigbergk | 2011-03-23 | 2 | -2/+67 |
* | | | | | Update draft release notes to 1.7.6 | Junio C Hamano | 2011-05-01 | 1 | -2/+7 |
* | | | | | Merge branch 'rs/strbuf-setlen-assert' | Junio C Hamano | 2011-05-01 | 1 | -5/+2 |
|\ \ \ \ \ | |||||
| * | | | | | strbuf: clarify assertion in strbuf_setlen() | René Scharfe | 2011-04-27 | 1 | -5/+2 |
* | | | | | | Merge branch 'vh/git-svn-doc' | Junio C Hamano | 2011-05-01 | 1 | -11/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-svn.txt: small typeface improvements | Valentin Haenel | 2011-04-26 | 1 | -4/+4 |
| * | | | | | | git-svn.txt: move option descriptions | Valentin Haenel | 2011-04-26 | 1 | -11/+11 |
| * | | | | | | git-svn.txt: fix usage of --add-author-from | Valentin Haenel | 2011-04-26 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-04-29 | 2 | -1/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | git-send-email: fix missing space in error message | Sylvain Rabot | 2011-04-29 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | t/test-lib.sh: minor readability improvements | Mathias Lafeldt | 2011-04-29 | 1 | -7/+9 |
* | | | | | | | diffcore-rename.c: avoid set-but-not-used warning | Jim Meyering | 2011-04-29 | 1 | -2/+1 |
* | | | | | | | Merge branch 'jc/diff-irreversible-delete' | Junio C Hamano | 2011-04-28 | 4 | -6/+70 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git diff -D: omit the preimage of deletes | Junio C Hamano | 2011-04-02 | 4 | -6/+70 |
* | | | | | | | | Merge branch 'jc/rename-degrade-cc-to-c' | Junio C Hamano | 2011-04-28 | 8 | -40/+152 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diffcore-rename: fall back to -C when -C -C busts the rename limit | Junio C Hamano | 2011-03-22 | 7 | -10/+112 |
| * | | | | | | | | diffcore-rename: record filepair for rename src | Junio C Hamano | 2011-03-22 | 1 | -11/+12 |
| * | | | | | | | | diffcore-rename: refactor "too many candidates" logic | Junio C Hamano | 2011-03-22 | 1 | -18/+29 |
| * | | | | | | | | builtin/diff.c: remove duplicated call to diff_result_code() | Junio C Hamano | 2011-03-22 | 1 | -3/+1 |
* | | | | | | | | | Merge branch 'mz/rebase' | Junio C Hamano | 2011-04-28 | 14 | -868/+844 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase: define options in OPTIONS_SPEC | Martin von Zweigbergk | 2011-03-04 | 1 | -45/+56 |
| * | | | | | | | | | Makefile: do not install sourced rebase scripts | Martin von Zweigbergk | 2011-02-25 | 2 | -3/+3 |
| * | | | | | | | | | rebase: use @{upstream} if no upstream specified | Martin von Zweigbergk | 2011-02-10 | 6 | -46/+85 |
| * | | | | | | | | | rebase -i: remove unnecessary state rebase-root | Martin von Zweigbergk | 2011-02-10 | 1 | -19/+0 |
| * | | | | | | | | | rebase -i: don't read unused variable preserve_merges | Martin von Zweigbergk | 2011-02-10 | 1 | -1/+0 |
| * | | | | | | | | | git-rebase--am: remove unnecessary --3way option | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+2 |
| * | | | | | | | | | rebase -m: don't print exit code 2 when merge fails | Martin von Zweigbergk | 2011-02-10 | 1 | -1/+1 |
| * | | | | | | | | | rebase -m: remember allow_rerere_autoupdate option | Martin von Zweigbergk | 2011-02-10 | 2 | -0/+25 |
| * | | | | | | | | | rebase: remember strategy and strategy options | Martin von Zweigbergk | 2011-02-10 | 3 | -2/+35 |
| * | | | | | | | | | rebase: remember verbose option | Martin von Zweigbergk | 2011-02-10 | 2 | -4/+4 |
| * | | | | | | | | | rebase: extract code for writing basic state | Martin von Zweigbergk | 2011-02-10 | 4 | -16/+16 |
| * | | | | | | | | | rebase: factor out sub command handling | Martin von Zweigbergk | 2011-02-10 | 2 | -33/+18 |
| * | | | | | | | | | rebase: make -v a tiny bit more verbose | Martin von Zweigbergk | 2011-02-10 | 2 | -16/+16 |
| * | | | | | | | | | rebase -i: align variable names | Martin von Zweigbergk | 2011-02-10 | 1 | -61/+59 |
| * | | | | | | | | | rebase: show consistent conflict resolution hint | Martin von Zweigbergk | 2011-02-10 | 1 | -3/+1 |
| * | | | | | | | | | rebase: extract am code to new source file | Martin von Zweigbergk | 2011-02-10 | 4 | -29/+38 |
| * | | | | | | | | | rebase: extract merge code to new source file | Martin von Zweigbergk | 2011-02-10 | 4 | -151/+167 |
| * | | | | | | | | | rebase: remove $branch as synonym for $orig_head | Martin von Zweigbergk | 2011-02-10 | 1 | -10/+9 |
| * | | | | | | | | | rebase -i: support --stat | Martin von Zweigbergk | 2011-02-10 | 1 | -7/+7 |
| * | | | | | | | | | rebase: factor out call to pre-rebase hook | Martin von Zweigbergk | 2011-02-10 | 2 | -19/+7 |