Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | update-index: migrate to parse-options API | Jonathan Nieder | 2010-12-07 | 1 | -149/+243 | |
| * | | | | | | | | | | | | | parse-options: Don't call parse_options_check() so much | Stephen Boyd | 2010-12-06 | 2 | -4/+4 | |
* | | | | | | | | | | | | | | Merge branch 'tc/format-patch-p' | Junio C Hamano | 2010-12-12 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | format-patch: page output with --stdout | Tay Ray Chuan | 2010-11-23 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | Merge branch 'jn/git-cmd-h-bypass-setup' | Junio C Hamano | 2010-12-12 | 7 | -0/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | update-index -h: show usage even with corrupt index | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | merge -h: show usage even with corrupt index | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | ls-files -h: show usage even with corrupt index | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | gc -h: show usage even with broken configuration | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | commit/status -h: show usage even with broken configuration | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | | | checkout-index -h: show usage even in an invalid repository | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | branch -h: show usage even in an invalid repository | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+3 | |
* | | | | | | | | | | | | | | | | 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-12 | 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-13 | 1 | -0/+248 | |
| * | | | | | | | | | | | | | | | | | git-remote-fd | Ilari Liusvaara | 2010-10-13 | 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-03 | 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-03 | 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-03 | 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-01 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.2' into maint | Junio C Hamano | 2010-12-01 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.1' into maint-1.7.2 | Junio C Hamano | 2010-12-01 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.0' into maint-1.7.1 | Junio C Hamano | 2010-12-01 | 1 | -1/+2 |