| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'mz/rebase-abort-reflog-fix' | Junio C Hamano | 2010-12-12 | 1 | -0/+12 |
| |\ | |||||
| | * | rebase --abort: do not update branch ref | Martin von Zweigbergk | 2010-11-23 | 1 | -0/+12 |
| * | | Merge branch 'jk/maint-reflog-bottom' | Junio C Hamano | 2010-12-12 | 1 | -0/+34 |
| |\ \ | |||||
| | * | | reflogs: clear flags properly in corner case | Jeff King | 2010-11-23 | 1 | -0/+34 |
| * | | | Merge branch 'mz/pull-rebase-rebased' | Junio C Hamano | 2010-12-12 | 1 | -0/+7 |
| |\ \ \ | |||||
| | * | | | Use reflog in 'pull --rebase . foo' | Martin von Zweigbergk | 2010-11-29 | 1 | -0/+7 |
| * | | | | Merge branch 'jn/git-cmd-h-bypass-setup' | Junio C Hamano | 2010-12-12 | 7 | -0/+169 |
| |\ \ \ \ | |||||
| | * | | | | update-index -h: show usage even with corrupt index | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+32 |
| | * | | | | merge -h: show usage even with corrupt index | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+11 |
| | * | | | | ls-files -h: show usage even with corrupt index | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+39 |
| | * | | | | gc -h: show usage even with broken configuration | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+28 |
| | * | | | | commit/status -h: show usage even with broken configuration | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+24 |
| | * | | | | checkout-index -h: show usage even in an invalid repository | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+24 |
| | * | | | | branch -h: show usage even in an invalid repository | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+11 |
| * | | | | | t9143: do not fail when unhandled.log.gz is not created | Torsten Bögershausen | 2010-12-10 | 1 | -3/+1 |
| * | | | | | git-svn: allow the mergeinfo property to be set | Steven Walter | 2010-12-10 | 1 | -0/+41 |
| * | | | | | Merge branch 'jk/pager-per-command' | Junio C Hamano | 2010-12-08 | 1 | -0/+29 |
| |\ \ \ \ \ | |||||
| | * | | | | | allow command-specific pagers in pager.<cmd> | Jeff King | 2010-11-17 | 1 | -0/+29 |
| * | | | | | | Merge branch 'jk/maint-decorate-01-bool' | Junio C Hamano | 2010-12-08 | 1 | -0/+9 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | log.decorate: accept 0/1 bool values | Jeff King | 2010-11-17 | 1 | -0/+9 |
| * | | | | | | Merge branch 'gc/http-with-non-ascii-username-url' | Junio C Hamano | 2010-12-08 | 4 | -0/+40 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix username and password extraction from HTTP URLs | Gabriel Corona | 2010-11-17 | 1 | -1/+1 |
| | * | | | | | | t5550: test HTTP authentication and userinfo decoding | Gabriel Corona | 2010-11-17 | 4 | -0/+40 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch 'mg/maint-tag-rfc1991' | Junio C Hamano | 2010-12-08 | 1 | -0/+66 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | tag: recognize rfc1991 signatures | Michael J Gruber | 2010-11-10 | 1 | -6/+6 |
| | * | | | | | | t/t7004-tag: test handling of rfc1991 signatures | Michael J Gruber | 2010-11-10 | 1 | -0/+66 |
| * | | | | | | | Merge branch 'jh/notes-merge' | Junio C Hamano | 2010-12-08 | 9 | -9/+2359 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Provide 'git merge --abort' as a synonym to 'git reset --merge' | Johan Herland | 2010-11-17 | 1 | -0/+313 |
| | * | | | | | | | Provide 'git notes get-ref' to easily retrieve current notes ref | Johan Herland | 2010-11-17 | 1 | -0/+19 |
| | * | | | | | | | git notes merge: Add testcases for merging notes trees at different fanouts | Johan Herland | 2010-11-17 | 1 | -0/+436 |
| | * | | | | | | | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland | 2010-11-17 | 1 | -0/+145 |
| | * | | | | | | | git notes merge: --commit should fail if underlying notes ref has moved | Johan Herland | 2010-11-17 | 1 | -0/+76 |
| | * | | | | | | | git notes merge: List conflicting notes in notes merge commit message | Johan Herland | 2010-11-17 | 1 | -0/+12 |
| | * | | | | | | | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 2010-11-17 | 1 | -0/+176 |
| | * | | | | | | | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 2010-11-17 | 1 | -0/+292 |
| | * | | | | | | | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland | 2010-11-17 | 1 | -0/+502 |
| | * | | | | | | | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 2010-11-17 | 1 | -0/+188 |
| | * | | | | | | | git notes merge: Initial implementation handling trivial merges only | Johan Herland | 2010-11-17 | 1 | -0/+180 |
| | * | | | | | | | notes.c: Use two newlines (instead of one) when concatenating notes | Johan Herland | 2010-11-17 | 4 | -0/+11 |
| | * | | | | | | | (trivial) t3303: Indent with tabs instead of spaces for consistency | Johan Herland | 2010-11-17 | 1 | -9/+9 |
| * | | | | | | | | Merge branch 'pn/commit-autosquash' | Junio C Hamano | 2010-12-03 | 4 | -2/+140 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | add tests of commit --squash | Pat Notz | 2010-11-04 | 4 | -0/+57 |
| | * | | | | | | | | add tests of commit --fixup | Pat Notz | 2010-11-04 | 3 | -2/+83 |
| * | | | | | | | | | Merge branch 'cb/leading-path-removal' | Junio C Hamano | 2010-11-29 | 2 | -31/+87 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | use persistent memory for rejected paths | Clemens Buchacher | 2010-11-15 | 2 | -11/+24 |
| | * | | | | | | | | | do not overwrite files in leading path | Clemens Buchacher | 2010-10-13 | 1 | -1/+1 |
| | * | | | | | | | | | t7607: add leading-path tests | Clemens Buchacher | 2010-10-13 | 1 | -0/+51 |
| | * | | | | | | | | | t7607: use test-lib functions and check MERGE_HEAD | Clemens Buchacher | 2010-10-13 | 1 | -23/+15 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'en/merge-recursive' | Junio C Hamano | 2010-11-29 | 6 | -17/+743 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | t6022: Use -eq not = to test output of wc -l | Brian Gernhardt | 2010-11-17 | 1 | -32/+32 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |