aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Update draft release notes to 1.7.6Junio C Hamano2011-05-01
* Merge branch 'rs/strbuf-setlen-assert'Junio C Hamano2011-05-01
|\
| * strbuf: clarify assertion in strbuf_setlen()René Scharfe2011-04-27
* | Merge branch 'vh/git-svn-doc'Junio C Hamano2011-05-01
|\ \
| * | git-svn.txt: small typeface improvementsValentin Haenel2011-04-26
| * | git-svn.txt: move option descriptionsValentin Haenel2011-04-26
| * | git-svn.txt: fix usage of --add-author-fromValentin Haenel2011-04-26
| |/
* | Merge branch 'maint'Junio C Hamano2011-04-29
|\ \
| * | Start 1.7.5.1 maintenance trackJunio C Hamano2011-04-29
| * | Merge branch 'mg/x-years-12-months' into maintJunio C Hamano2011-04-29
| |\ \
| * | | git-send-email: fix missing space in error messageSylvain Rabot2011-04-29
| | |/ | |/|
* | | t/test-lib.sh: minor readability improvementsMathias Lafeldt2011-04-29
* | | diffcore-rename.c: avoid set-but-not-used warningJim Meyering2011-04-29
* | | Merge branch 'jc/diff-irreversible-delete'Junio C Hamano2011-04-28
|\ \ \
| * | | git diff -D: omit the preimage of deletesJunio C Hamano2011-04-02
* | | | Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano2011-04-28
|\ \ \ \
| * | | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-22
| * | | | diffcore-rename: record filepair for rename srcJunio C Hamano2011-03-22
| * | | | diffcore-rename: refactor "too many candidates" logicJunio C Hamano2011-03-22
| * | | | builtin/diff.c: remove duplicated call to diff_result_code()Junio C Hamano2011-03-22
* | | | | Merge branch 'mz/rebase'Junio C Hamano2011-04-28
|\ \ \ \ \
| * | | | | rebase: define options in OPTIONS_SPECMartin von Zweigbergk2011-03-04
| * | | | | Makefile: do not install sourced rebase scriptsMartin von Zweigbergk2011-02-25
| * | | | | rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-10
| * | | | | rebase -i: remove unnecessary state rebase-rootMartin von Zweigbergk2011-02-10
| * | | | | rebase -i: don't read unused variable preserve_mergesMartin von Zweigbergk2011-02-10
| * | | | | git-rebase--am: remove unnecessary --3way optionMartin von Zweigbergk2011-02-10
| * | | | | rebase -m: don't print exit code 2 when merge failsMartin von Zweigbergk2011-02-10
| * | | | | rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk2011-02-10
| * | | | | rebase: remember strategy and strategy optionsMartin von Zweigbergk2011-02-10
| * | | | | rebase: remember verbose optionMartin von Zweigbergk2011-02-10
| * | | | | rebase: extract code for writing basic stateMartin von Zweigbergk2011-02-10
| * | | | | rebase: factor out sub command handlingMartin von Zweigbergk2011-02-10
| * | | | | rebase: make -v a tiny bit more verboseMartin von Zweigbergk2011-02-10
| * | | | | rebase -i: align variable namesMartin von Zweigbergk2011-02-10
| * | | | | rebase: show consistent conflict resolution hintMartin von Zweigbergk2011-02-10
| * | | | | rebase: extract am code to new source fileMartin von Zweigbergk2011-02-10
| * | | | | rebase: extract merge code to new source fileMartin von Zweigbergk2011-02-10
| * | | | | rebase: remove $branch as synonym for $orig_headMartin von Zweigbergk2011-02-10
| * | | | | rebase -i: support --statMartin von Zweigbergk2011-02-10
| * | | | | rebase: factor out call to pre-rebase hookMartin von Zweigbergk2011-02-10
| * | | | | rebase: factor out clean work tree checkMartin von Zweigbergk2011-02-10
| * | | | | rebase: factor out reference parsingMartin von Zweigbergk2011-02-10
| * | | | | rebase: reorder validation stepsMartin von Zweigbergk2011-02-10
| * | | | | rebase -i: remove now unnecessary directory checksMartin von Zweigbergk2011-02-10
| * | | | | rebase: factor out command line option processingMartin von Zweigbergk2011-02-10
| * | | | | rebase: align variable contentMartin von Zweigbergk2011-02-10
| * | | | | rebase: align variable namesMartin von Zweigbergk2011-02-10
| * | | | | rebase: stricter check of standalone sub commandMartin von Zweigbergk2011-02-10
| * | | | | rebase: act on command line outside parsing loopMartin von Zweigbergk2011-02-10