summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'pb/log-first-parent-p-m'Junio C Hamano2010-03-2417-30/+653
|\ \ \ \ \ \ \ \
| * | | | | | | | show --first-parent/-m: do not default to --ccJunio C Hamano2010-03-094-3/+134
| * | | | | | | | show -c: show patch textJunio C Hamano2010-03-096-8/+62
| * | | | | | | | revision: introduce setup_revision_optJunio C Hamano2010-03-095-16/+44
| * | | | | | | | t4013: add tests for log -p -m --first-parentJunio C Hamano2010-03-094-0/+381
| * | | | | | | | git log -p -m: document -m and honor --first-parentPetr Baudis2010-02-124-3/+32
* | | | | | | | | Merge branch 'jc/maint-refs-dangling'Junio C Hamano2010-03-242-7/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refs: ref entry with NULL sha1 is can be a dangling symrefJunio C Hamano2010-03-152-7/+10
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-03-241-0/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'jc/color-attrs' into maintJunio C Hamano2010-03-243-14/+41
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-add-ignored-dir' into maintJunio C Hamano2010-03-243-4/+103
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'bg/apply-fix-blank-at-eof' into maintJunio C Hamano2010-03-244-40/+450
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: explain the meaning of "-g" in git-describe outputMarkus Heidelberg2010-03-241-0/+3
* | | | | | | | | | | | | Sync with Git 1.7.0.3Junio C Hamano2010-03-219-25/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Git 1.7.0.3v1.7.0.3Junio C Hamano2010-03-213-10/+5
| * | | | | | | | | | | | Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-03-214-14/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Documentation/git-clone: Transform description list into item listMichael J Gruber2010-03-211-5/+5
| | * | | | | | | | | | | | Documentation/urls: Remove spurious example markersMichael J Gruber2010-03-211-6/+0
| | * | | | | | | | | | | | Documentation/gitdiffcore: Remove misleading date in headingMichael J Gruber2010-03-211-1/+1
| | * | | | | | | | | | | | Documentation/git-reflog: Fix formatting of command listsMichael J Gruber2010-03-211-2/+0
| * | | | | | | | | | | | | .mailmap: Map the the first submissions of MJG by e-mailMichael J Gruber2010-03-211-0/+1
* | | | | | | | | | | | | | Update draft release notes to 1.7.1Junio C Hamano2010-03-201-2/+34
* | | | | | | | | | | | | | Merge branch 'jk/maint-add-ignored-dir'Junio C Hamano2010-03-203-4/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | tests for "git add ignored-dir/file" without -fJunio C Hamano2010-03-131-0/+79
| * | | | | | | | | | | | | dir: fix COLLECT_IGNORED on excluded prefixesJeff King2010-03-131-2/+18
| * | | | | | | | | | | | | t0050: mark non-working test as suchJunio C Hamano2010-03-131-2/+6
* | | | | | | | | | | | | | Merge branch 'ml/color-grep'Junio C Hamano2010-03-206-43/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | grep: Colorize selected, context, and function linesMark Lodato2010-03-084-2/+27
| * | | | | | | | | | | | | | grep: Colorize filename, line number, and separatorMark Lodato2010-03-084-34/+78
| * | | | | | | | | | | | | | Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*Mark Lodato2010-03-073-7/+18
* | | | | | | | | | | | | | | Merge branch 'jc/color-attrs'Junio C Hamano2010-03-203-14/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | color: allow multiple attributesJunio C Hamano2010-03-073-14/+41
* | | | | | | | | | | | | | | Merge branch 'cc/reset-keep'Junio C Hamano2010-03-205-20/+229
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation: improve description of "git reset --keep"Junio C Hamano2010-03-081-3/+6
| * | | | | | | | | | | | | | | reset: disallow using --keep when there are unmerged entriesChristian Couder2010-03-064-22/+28
| * | | | | | | | | | | | | | | reset: disallow "reset --keep" outside a work treeChristian Couder2010-03-062-9/+18
| * | | | | | | | | | | | | | | Documentation: reset: describe new "--keep" optionChristian Couder2010-03-061-1/+48
| * | | | | | | | | | | | | | | reset: add test cases for "--keep" optionChristian Couder2010-01-242-1/+126
| * | | | | | | | | | | | | | | reset: add option "--keep" to "git reset"Christian Couder2010-01-241-5/+24
* | | | | | | | | | | | | | | | Merge branch 'fl/askpass'Junio C Hamano2010-03-205-13/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-core: Support retrieving passwords with GIT_ASKPASSFrank Li2010-03-044-3/+41
| * | | | | | | | | | | | | | | | git-svn: Support retrieving passwords with GIT_ASKPASSFrank Li2010-03-021-10/+17
* | | | | | | | | | | | | | | | | Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano2010-03-204-40/+450
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | t3417: Add test cases for "rebase --whitespace=fix"Björn Gustavsson2010-03-061-0/+126
| * | | | | | | | | | | | | | | | t4124: Add additional tests of --whitespace=fixBjörn Gustavsson2010-03-061-0/+170
| * | | | | | | | | | | | | | | | apply: Allow blank context lines to match beyond EOFBjörn Gustavsson2010-03-061-30/+138
| * | | | | | | | | | | | | | | | apply: Remove the quick rejection testBjörn Gustavsson2010-03-062-5/+16
| * | | | | | | | | | | | | | | | apply: Don't unnecessarily update line lengths in the preimageBjörn Gustavsson2010-03-061-11/+6
* | | | | | | | | | | | | | | | | Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-206-79/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | merge-file: add option to select union merge favorBert Wesarg2010-03-022-6/+9
View Lorry Controller Status