index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin
Commit message (
Expand
)
Author
Age
*
Merge branch 'mg/maint-tag-rfc1991'
Junio C Hamano
2010-12-08
|
\
|
*
tag: factor out sig detection for tag display
Michael J Gruber
2010-11-10
|
*
tag: factor out sig detection for body edits
Michael J Gruber
2010-11-10
|
*
verify-tag: factor out signature detection
Michael J Gruber
2010-11-10
*
|
Merge branch 'jh/notes-merge'
Junio C Hamano
2010-12-08
|
\
\
|
*
|
Provide 'git merge --abort' as a synonym to 'git reset --merge'
Johan Herland
2010-11-17
|
*
|
cmd_merge(): Parse options before checking MERGE_HEAD
Johan Herland
2010-11-17
|
*
|
Provide 'git notes get-ref' to easily retrieve current notes ref
Johan Herland
2010-11-17
|
*
|
git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
Johan Herland
2010-11-17
|
*
|
git notes merge: --commit should fail if underlying notes ref has moved
Johan Herland
2010-11-17
|
*
|
git notes merge: List conflicting notes in notes merge commit message
Johan Herland
2010-11-17
|
*
|
git notes merge: Manual conflict resolution, part 2/2
Johan Herland
2010-11-17
|
*
|
git notes merge: Manual conflict resolution, part 1/2
Johan Herland
2010-11-17
|
*
|
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
Johan Herland
2010-11-17
|
*
|
git notes merge: Handle real, non-conflicting notes merges
Johan Herland
2010-11-17
|
*
|
builtin/notes.c: Refactor creation of notes commits.
Johan Herland
2010-11-17
|
*
|
git notes merge: Initial implementation handling trivial merges only
Johan Herland
2010-11-17
|
*
|
builtin/notes.c: Split notes ref DWIMmery into a separate function
Johan Herland
2010-11-17
|
*
|
notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
Johan Herland
2010-11-17
*
|
|
Merge branch 'jn/thinner-wrapper'
Junio C Hamano
2010-12-03
|
\
\
\
|
*
|
|
pack-objects: mark file-local variable static
Jonathan Nieder
2010-11-10
*
|
|
|
Merge branch 'pn/commit-autosquash'
Junio C Hamano
2010-12-03
|
\
\
\
\
|
*
|
|
|
commit: --squash option for use with rebase --autosquash
Pat Notz
2010-11-04
|
*
|
|
|
commit: --fixup option for use with rebase --autosquash
Pat Notz
2010-11-04
|
*
|
|
|
commit: helper methods to reduce redundant blocks of code
Pat Notz
2010-11-04
*
|
|
|
|
Merge branch 'sn/diff-doc'
Junio C Hamano
2010-12-03
|
\
\
\
\
\
|
*
|
|
|
|
diff,difftool: Don't use the {0,2} notation in usage strings
Štěpán Němec
2010-11-05
|
|
|
/
/
/
|
|
/
|
|
|
*
|
|
|
|
Merge branch 'maint'
Junio C Hamano
2010-12-01
|
\
\
\
\
\
|
*
\
\
\
\
Merge branch 'maint-1.7.2' into maint
Junio C Hamano
2010-12-01
|
|
\
\
\
\
\
|
|
*
\
\
\
\
Merge branch 'maint-1.7.1' into maint-1.7.2
Junio C Hamano
2010-12-01
|
|
|
\
\
\
\
\
|
|
|
*
|
|
|
|
Merge branch 'maint-1.7.0' into maint-1.7.1
Junio C Hamano
2010-12-01
|
*
|
|
|
|
|
|
Merge branch 'jk/maint-apply-no-binary' into maint
Junio C Hamano
2010-11-24
|
|
\
\
\
\
\
\
\
|
*
\
\
\
\
\
\
\
Merge branch 'jn/send-pack-error' into maint
Junio C Hamano
2010-11-24
|
|
\
\
\
\
\
\
\
\
|
*
\
\
\
\
\
\
\
\
Merge branch 'jk/maint-rev-list-nul' into maint
Junio C Hamano
2010-11-24
|
|
\
\
\
\
\
\
\
\
\
|
*
\
\
\
\
\
\
\
\
\
Merge branch 'bc/fix-cherry-pick-root' into maint
Junio C Hamano
2010-11-24
|
|
\
\
\
\
\
\
\
\
\
\
*
|
\
\
\
\
\
\
\
\
\
\
Merge branch 'jl/clone-recurse-sm-synonym'
Junio C Hamano
2010-11-29
|
\
\
\
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
|
|
|
clone: Add the --recurse-submodules option as alias for --recursive
Jens Lehmann
2010-11-05
|
|
|
_
|
_
|
_
|
_
|
_
|
_
|
/
/
/
/
|
|
/
|
|
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
|
|
|
Merge branch 'jn/cherry-pick-refresh-index'
Junio C Hamano
2010-11-29
|
\
\
\
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
|
|
|
cherry-pick/revert: transparently refresh index
Jonathan Nieder
2010-11-10
|
|
|
_
|
_
|
_
|
_
|
_
|
_
|
_
|
_
|
_
|
/
|
|
/
|
|
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
|
|
|
Merge branch 'np/pack-broken-boundary'
Junio C Hamano
2010-11-29
|
\
\
\
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
|
|
|
make pack-objects a bit more resilient to repo corruption
Nicolas Pitre
2010-10-22
|
|
/
/
/
/
/
/
/
/
/
/
/
*
|
|
|
|
|
|
|
|
|
|
|
Merge branch 'fc/apply-p2-get-header-name'
Junio C Hamano
2010-11-29
|
\
\
\
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
|
|
|
Fix git-apply with -p greater than 1
Federico Cuello
2010-11-05
|
|
/
/
/
/
/
/
/
/
/
/
/
*
|
|
|
|
|
|
|
|
|
|
|
Merge branch 'kb/blame-author-email'
Junio C Hamano
2010-11-29
|
\
\
\
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
|
|
|
blame: Add option to show author email instead of name
Kevin Ballard
2010-10-19
*
|
|
|
|
|
|
|
|
|
|
|
|
Merge branch 'ak/apply-non-git-epoch'
Junio C Hamano
2010-11-29
|
\
\
\
\
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
|
|
|
|
apply: handle patches with funny filename and colon in timezone
Jonathan Nieder
2010-11-10
|
*
|
|
|
|
|
|
|
|
|
|
|
|
apply: Recognize epoch timestamps with : in the timezone
Anders Kaseorg
2010-10-13
*
|
|
|
|
|
|
|
|
|
|
|
|
|
Merge branch 'cb/maint-orphan-merge-noclobber'
Junio C Hamano
2010-11-24
|
\
\
\
\
\
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
|
|
|
|
|
do not overwrite untracked during merge from unborn branch
Clemens Buchacher
2010-11-15
[next]
