Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | thread-utils.h: simplify the inclusion | Junio C Hamano | 2010-12-10 | 2 | -8/+0 |
* | Merge branch 'nd/maint-fix-add-typo-detection' (early part) | Junio C Hamano | 2010-12-08 | 1 | -1/+2 |
|\ | |||||
| * | add: do not rely on dtype being NULL behavior | Nguyễn Thái Ngọc Duy | 2010-11-13 | 1 | -1/+2 |
* | | Merge branch 'il/remote-fd-ext' | Junio C Hamano | 2010-12-08 | 2 | -0/+325 |
|\ \ | |||||
| * | | remote-fd/ext: finishing touches after code review | Ilari Liusvaara | 2010-11-19 | 2 | -8/+6 |
| * | | git-remote-ext | Ilari Liusvaara | 2010-10-14 | 1 | -0/+248 |
| * | | git-remote-fd | Ilari Liusvaara | 2010-10-14 | 1 | -0/+79 |
* | | | Merge branch 'mg/maint-tag-rfc1991' | Junio C Hamano | 2010-12-08 | 2 | -20/+6 |
|\ \ \ | |||||
| * | | | tag: factor out sig detection for tag display | Michael J Gruber | 2010-11-10 | 1 | -2/+2 |
| * | | | tag: factor out sig detection for body edits | Michael J Gruber | 2010-11-10 | 1 | -10/+2 |
| * | | | verify-tag: factor out signature detection | Michael J Gruber | 2010-11-10 | 1 | -8/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'jh/notes-merge' | Junio C Hamano | 2010-12-08 | 2 | -50/+265 |
|\ \ \ | |||||
| * | | | Provide 'git merge --abort' as a synonym to 'git reset --merge' | Johan Herland | 2010-11-17 | 1 | -0/+14 |
| * | | | cmd_merge(): Parse options before checking MERGE_HEAD | Johan Herland | 2010-11-17 | 1 | -16/+17 |
| * | | | Provide 'git notes get-ref' to easily retrieve current notes ref | Johan Herland | 2010-11-17 | 1 | -0/+23 |
| * | | | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland | 2010-11-17 | 1 | -2/+6 |
| * | | | git notes merge: --commit should fail if underlying notes ref has moved | Johan Herland | 2010-11-17 | 1 | -2/+9 |
| * | | | git notes merge: List conflicting notes in notes merge commit message | Johan Herland | 2010-11-17 | 1 | -1/+1 |
| * | | | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 2010-11-17 | 1 | -3/+103 |
| * | | | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 2010-11-17 | 1 | -4/+4 |
| * | | | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland | 2010-11-17 | 1 | -1/+20 |
| * | | | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 2010-11-17 | 1 | -5/+10 |
| * | | | builtin/notes.c: Refactor creation of notes commits. | Johan Herland | 2010-11-17 | 1 | -23/+5 |
| * | | | git notes merge: Initial implementation handling trivial merges only | Johan Herland | 2010-11-17 | 1 | -0/+54 |
| * | | | builtin/notes.c: Split notes ref DWIMmery into a separate function | Johan Herland | 2010-11-17 | 1 | -6/+11 |
| * | | | notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond | Johan Herland | 2010-11-17 | 1 | -5/+6 |
* | | | | Merge branch 'jn/thinner-wrapper' | Junio C Hamano | 2010-12-04 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | pack-objects: mark file-local variable static | Jonathan Nieder | 2010-11-10 | 1 | -1/+1 |
* | | | | | Merge branch 'pn/commit-autosquash' | Junio C Hamano | 2010-12-04 | 3 | -30/+56 |
|\ \ \ \ \ | |||||
| * | | | | | commit: --squash option for use with rebase --autosquash | Pat Notz | 2010-11-04 | 1 | -2/+33 |
| * | | | | | commit: --fixup option for use with rebase --autosquash | Pat Notz | 2010-11-04 | 1 | -4/+18 |
| * | | | | | commit: helper methods to reduce redundant blocks of code | Pat Notz | 2010-11-04 | 3 | -25/+6 |
* | | | | | | Merge branch 'sn/diff-doc' | Junio C Hamano | 2010-12-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff,difftool: Don't use the {0,2} notation in usage strings | Štěpán Němec | 2010-11-05 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-12-02 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'maint-1.7.2' into maint | Junio C Hamano | 2010-12-02 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'maint-1.7.1' into maint-1.7.2 | Junio C Hamano | 2010-12-02 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Merge branch 'maint-1.7.0' into maint-1.7.1 | Junio C Hamano | 2010-12-02 | 1 | -1/+2 |
| * | | | | | | | | Merge branch 'jk/maint-apply-no-binary' into maint | Junio C Hamano | 2010-11-24 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jn/send-pack-error' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-rev-list-nul' into maint | Junio C Hamano | 2010-11-24 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/fix-cherry-pick-root' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jl/clone-recurse-sm-synonym' | Junio C Hamano | 2010-11-30 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | clone: Add the --recurse-submodules option as alias for --recursive | Jens Lehmann | 2010-11-05 | 1 | -0/+2 |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jn/cherry-pick-refresh-index' | Junio C Hamano | 2010-11-30 | 1 | -2/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | cherry-pick/revert: transparently refresh index | Jonathan Nieder | 2010-11-10 | 1 | -2/+16 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'np/pack-broken-boundary' | Junio C Hamano | 2010-11-30 | 1 | -1/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | make pack-objects a bit more resilient to repo corruption | Nicolas Pitre | 2010-10-22 | 1 | -1/+15 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'fc/apply-p2-get-header-name' | Junio C Hamano | 2010-11-30 | 1 | -14/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fix git-apply with -p greater than 1 | Federico Cuello | 2010-11-05 | 1 | -14/+14 |
| |/ / / / / / / / / / / / |