summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nm/submodule-update-force'Junio C Hamano2011-05-023-7/+36
|\
| * submodule: Add --force option for git submodule updateNicolas Morey-Chaisemartin2011-04-043-7/+36
* | Merge branch 'jh/notes-add-ui'Junio C Hamano2011-05-023-7/+49
|\ \
| * | Make "git notes add" more user-friendly when there are existing notesJohan Herland2011-03-303-7/+49
* | | Merge branch 'nd/maint-setup'Junio C Hamano2011-05-023-45/+34
|\ \ \
| * | | Kill off get_relative_cwd()Nguyễn Thái Ngọc Duy2011-03-282-50/+6
| * | | setup: return correct prefix if worktree is '/'Nguyễn Thái Ngọc Duy2011-03-283-3/+36
* | | | Merge branch 'mz/maint-rename-unmerged'Junio C Hamano2011-05-022-2/+67
|\ \ \ \
| * | | | diffcore-rename: don't consider unmerged path as sourceMartin von Zweigbergk2011-03-232-2/+67
* | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-011-2/+7
* | | | | Merge branch 'rs/strbuf-setlen-assert'Junio C Hamano2011-05-011-5/+2
|\ \ \ \ \
| * | | | | strbuf: clarify assertion in strbuf_setlen()René Scharfe2011-04-271-5/+2
* | | | | | Merge branch 'vh/git-svn-doc'Junio C Hamano2011-05-011-11/+11
|\ \ \ \ \ \
| * | | | | | git-svn.txt: small typeface improvementsValentin Haenel2011-04-261-4/+4
| * | | | | | git-svn.txt: move option descriptionsValentin Haenel2011-04-261-11/+11
| * | | | | | git-svn.txt: fix usage of --add-author-fromValentin Haenel2011-04-261-1/+1
| |/ / / / /
* | | | | | Merge branch 'maint'Junio C Hamano2011-04-292-1/+15
|\ \ \ \ \ \
| * | | | | | Start 1.7.5.1 maintenance trackJunio C Hamano2011-04-292-1/+15
| * | | | | | Merge branch 'mg/x-years-12-months' into maintJunio C Hamano2011-04-292-2/+4
| |\ \ \ \ \ \
| * | | | | | | git-send-email: fix missing space in error messageSylvain Rabot2011-04-291-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | t/test-lib.sh: minor readability improvementsMathias Lafeldt2011-04-291-7/+9
* | | | | | | diffcore-rename.c: avoid set-but-not-used warningJim Meyering2011-04-291-2/+1
* | | | | | | Merge branch 'jc/diff-irreversible-delete'Junio C Hamano2011-04-284-6/+70
|\ \ \ \ \ \ \
| * | | | | | | git diff -D: omit the preimage of deletesJunio C Hamano2011-04-024-6/+70
* | | | | | | | Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano2011-04-288-40/+152
|\ \ \ \ \ \ \ \
| * | | | | | | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-227-10/+112
| * | | | | | | | diffcore-rename: record filepair for rename srcJunio C Hamano2011-03-221-11/+12
| * | | | | | | | diffcore-rename: refactor "too many candidates" logicJunio C Hamano2011-03-221-18/+29
| * | | | | | | | builtin/diff.c: remove duplicated call to diff_result_code()Junio C Hamano2011-03-221-3/+1
* | | | | | | | | Merge branch 'mz/rebase'Junio C Hamano2011-04-2814-868/+844
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase: define options in OPTIONS_SPECMartin von Zweigbergk2011-03-041-45/+56
| * | | | | | | | | Makefile: do not install sourced rebase scriptsMartin von Zweigbergk2011-02-252-3/+3
| * | | | | | | | | rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-106-46/+85
| * | | | | | | | | rebase -i: remove unnecessary state rebase-rootMartin von Zweigbergk2011-02-101-19/+0
| * | | | | | | | | rebase -i: don't read unused variable preserve_mergesMartin von Zweigbergk2011-02-101-1/+0
| * | | | | | | | | git-rebase--am: remove unnecessary --3way optionMartin von Zweigbergk2011-02-101-2/+2
| * | | | | | | | | rebase -m: don't print exit code 2 when merge failsMartin von Zweigbergk2011-02-101-1/+1
| * | | | | | | | | rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk2011-02-102-0/+25
| * | | | | | | | | rebase: remember strategy and strategy optionsMartin von Zweigbergk2011-02-103-2/+35
| * | | | | | | | | rebase: remember verbose optionMartin von Zweigbergk2011-02-102-4/+4
| * | | | | | | | | rebase: extract code for writing basic stateMartin von Zweigbergk2011-02-104-16/+16
| * | | | | | | | | rebase: factor out sub command handlingMartin von Zweigbergk2011-02-102-33/+18
| * | | | | | | | | rebase: make -v a tiny bit more verboseMartin von Zweigbergk2011-02-102-16/+16
| * | | | | | | | | rebase -i: align variable namesMartin von Zweigbergk2011-02-101-61/+59
| * | | | | | | | | rebase: show consistent conflict resolution hintMartin von Zweigbergk2011-02-101-3/+1
| * | | | | | | | | rebase: extract am code to new source fileMartin von Zweigbergk2011-02-104-29/+38
| * | | | | | | | | rebase: extract merge code to new source fileMartin von Zweigbergk2011-02-104-151/+167
| * | | | | | | | | rebase: remove $branch as synonym for $orig_headMartin von Zweigbergk2011-02-101-10/+9
| * | | | | | | | | rebase -i: support --statMartin von Zweigbergk2011-02-101-7/+7
| * | | | | | | | | rebase: factor out call to pre-rebase hookMartin von Zweigbergk2011-02-102-19/+7