summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'aa/status-hilite-branch'Junio C Hamano2010-12-161-0/+2
|\
| * status: show branchname with a configurable colorAleksi Aalto2010-11-291-0/+2
* | Merge branch 'ak/describe-exact'Junio C Hamano2010-12-161-25/+60
|\ \
| * | describe: Delay looking up commits until searching for an inexact matchAnders Kaseorg2010-12-091-15/+22
| * | describe: Store commit_names in a hash table by commit SHA1Anders Kaseorg2010-12-091-5/+33
| * | describe: Do not use a flex array in struct commit_nameAnders Kaseorg2010-12-091-6/+6
| * | describe: Use for_each_rawrefAnders Kaseorg2010-12-091-1/+1
| * | Merge branch 'cb/maint-orphan-merge-noclobber' into maintJunio C Hamano2010-12-021-1/+19
| |\ \
| * \ \ Merge branch 'tr/maint-merge-file-subdir' into maintJunio C Hamano2010-12-021-1/+6
| |\ \ \
| * \ \ \ Merge branch 'ks/no-textconv-symlink' into maintJunio C Hamano2010-12-022-12/+23
| |\ \ \ \
* | \ \ \ \ Merge branch 'jn/parse-options-extra'Junio C Hamano2010-12-123-154/+248
|\ \ \ \ \ \
| * | | | | | update-index: migrate to parse-options APIJonathan Nieder2010-12-071-149/+243
| * | | | | | parse-options: Don't call parse_options_check() so muchStephen Boyd2010-12-062-4/+4
* | | | | | | Merge branch 'tc/format-patch-p'Junio C Hamano2010-12-121-0/+2
|\ \ \ \ \ \ \
| * | | | | | | format-patch: page output with --stdoutTay Ray Chuan2010-11-231-0/+2
* | | | | | | | Merge branch 'jn/git-cmd-h-bypass-setup'Junio C Hamano2010-12-127-0/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | update-index -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-221-0/+3
| * | | | | | | | merge -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-221-0/+2
| * | | | | | | | ls-files -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-221-0/+3
| * | | | | | | | gc -h: show usage even with broken configurationNguyễn Thái Ngọc Duy2010-10-221-0/+3
| * | | | | | | | commit/status -h: show usage even with broken configurationNguyễn Thái Ngọc Duy2010-10-221-0/+6
| * | | | | | | | checkout-index -h: show usage even in an invalid repositoryNguyễn Thái Ngọc Duy2010-10-221-0/+3
| * | | | | | | | branch -h: show usage even in an invalid repositoryNguyễn Thái Ngọc Duy2010-10-221-0/+3
* | | | | | | | | thread-utils.h: simplify the inclusionJunio C Hamano2010-12-102-8/+0
* | | | | | | | | Merge branch 'nd/maint-fix-add-typo-detection' (early part)Junio C Hamano2010-12-081-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: do not rely on dtype being NULL behaviorNguyễn Thái Ngọc Duy2010-11-121-1/+2
* | | | | | | | | | Merge branch 'il/remote-fd-ext'Junio C Hamano2010-12-082-0/+325
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remote-fd/ext: finishing touches after code reviewIlari Liusvaara2010-11-192-8/+6
| * | | | | | | | | | git-remote-extIlari Liusvaara2010-10-131-0/+248
| * | | | | | | | | | git-remote-fdIlari Liusvaara2010-10-131-0/+79
* | | | | | | | | | | Merge branch 'mg/maint-tag-rfc1991'Junio C Hamano2010-12-082-20/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tag: factor out sig detection for tag displayMichael J Gruber2010-11-101-2/+2
| * | | | | | | | | | | tag: factor out sig detection for body editsMichael J Gruber2010-11-101-10/+2
| * | | | | | | | | | | verify-tag: factor out signature detectionMichael J Gruber2010-11-101-8/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-082-50/+265
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-171-0/+14
| * | | | | | | | | | | cmd_merge(): Parse options before checking MERGE_HEADJohan Herland2010-11-171-16/+17
| * | | | | | | | | | | Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland2010-11-171-0/+23
| * | | | | | | | | | | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-171-2/+6
| * | | | | | | | | | | git notes merge: --commit should fail if underlying notes ref has movedJohan Herland2010-11-171-2/+9
| * | | | | | | | | | | git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-171-1/+1
| * | | | | | | | | | | git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-171-3/+103
| * | | | | | | | | | | git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-171-4/+4
| * | | | | | | | | | | git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-171-1/+20
| * | | | | | | | | | | git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-171-5/+10
| * | | | | | | | | | | builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-171-23/+5
| * | | | | | | | | | | git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-171-0/+54
| * | | | | | | | | | | builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland2010-11-171-6/+11
| * | | | | | | | | | | notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland2010-11-171-5/+6
* | | | | | | | | | | | Merge branch 'jn/thinner-wrapper'Junio C Hamano2010-12-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status