repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge: record tag objects without peeling in MERGE_HEAD
2011-11-08
Junio C
H
aman
o
merge: record tag object
s
w
i
tho
u
t pee
l
i
ng in MERGE_
H
EAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Junio C Hamano
merge:
make usage of commit->util mo
r
e extensible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Junio C Hamano
fm
t
-m
e
rge-msg
:
Ad
d
conten
t
s o
f
merged tag in the me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Junio C Ham
a
no
f
mt
-
me
r
ge-ms
g
: p
a
ckage option
s
into a s
t
ructure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Junio C Hamano
f
m
t-me
r
ge-msg: avoid early returns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Junio C Hama
n
o
r
efs DWIMmer
y
: use th
e
sam
e
ru
l
e
fo
r
bo
t
h "git fe
t
ch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Junio C Hama
n
o
fetch:
a
llow "git fet
c
h $there
v1
.
0
"
to fetch a tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Jun
i
o C Hamano
merge: notic
e
local
m
er
g
i
ng of tags and keep it unwrapped
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-05
Junio C Hamano
Split GPG inter
f
ace
i
nto
its ow
n
h
e
lper library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-19
Jun
i
o C Hamano
M
erge branc
h
'js/merge
-
edit-option'
commit
|
commitdiff
|
tree
2011-10-19
Ju
n
io C H
a
ma
n
o
Merge b
r
anch 'rs/
d
i
ff-whole-function'
commit
|
commitdiff
|
tree
2011-10-19
Juni
o
C
Hama
n
o
M
e
rg
e
branch 'rs/pickaxe'
commit
|
commitdiff
|
tree
2011-10-19
Jun
i
o
C Haman
o
Merge branch 'js/no
-
c
h
erry-pick
-
he
a
d
-a
f
ter-punted'
commit
|
commitdiff
|
tree
2011-10-19
Junio
C Hamano
Mer
g
e br
a
nch 'bk/submodu
l
e-in-recursive-merge'
commit
|
commitdiff
|
tree
2011-10-19
Juni
o
C Hama
n
o
M
e
r
ge branch 'jm/maint-apply-de
t
ects
-
corrupt-patch
.
.
.
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hamano
Merge branc
h
'
j
k/con
f
ig-test-cleanup'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hamano
Merge b
r
anch
'
js/lo
g
-
s
how-ch
i
ldren'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Ham
a
no
M
erge
branch 'cb
/
httpd-test-fi
x
-
p
ort'
commit
|
commitdiff
|
tree
2011-10-19
J
u
nio C
Hamano
Merg
e
bran
c
h 'jn/gitweb
-
manpages'
commit
|
commitdiff
|
tree
2011-10-19
Jun
i
o C Hama
n
o
Merge
branch 'pt/mingw-misc-fixes'
commit
|
commitdiff
|
tree
2011-10-19
J
unio C Ham
a
no
M
erg
e
branch 'md/smt
p
-t
l
s-
h
ello-again'
commit
|
commitdiff
|
tree
2011-10-19
Juni
o
C Haman
o
M
er
g
e
branch 'maint
'
commit
|
commitdiff
|
tree
2011-10-18
Junio
C
Hamano
Update draft r
e
lease n
o
tes
t
o 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-18
J
u
nio C Hamano
Merge branc
h
'jk/http-auth'
commit
|
commitdiff
|
tree
2011-10-18
Junio C
H
amano
Merge br
a
nc
h
'
j
s/
c
hec
k
-ref-format-test-m
i
ngw
'
commit
|
commitdiff
|
tree
2011-10-18
J
u
n
io C Hamano
Me
r
ge branc
h
'jk/pull-rebase-wit
h
-work
-
tree'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
Merge bran
c
h 'jk/config-
t
est-cleanup'
commit
|
commitdiff
|
tree
2011-10-18
J
unio
C H
a
mano
Merg
e
bra
n
ch 'bc/attr-ig
n
ore-case'
commit
|
commitdiff
|
tree
2011-10-18
J
u
nio C Hama
n
o
Merge
b
ranch 'sg/
c
ompletion'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
Merge b
r
anch 'mm/maint-confi
g
-explicit-bool-displ
a
y'
commit
|
commitdiff
|
tree
2011-10-18
Junio C
Hamano
Mer
g
e bra
n
ch 'tc/fetch-lea
k
'
commit
|
commitdiff
|
tree
2011-10-18
J
u
ni
o
C Hamano
M
erge br
a
nch
'
jk/name-h
a
sh
-
dirent'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Haman
o
M
e
r
ge branc
h
'ef/m
i
ngw-syslog'
commit
|
commitdiff
|
tree
2011-10-18
J
unio C Hamano
Merge branc
h
'tm/com
p
let
i
on-push-set-ups
t
ream'
commit
|
commitdiff
|
tree
2011-10-18
Junio C H
a
mano
Merge
b
r
anch
'tm/c
o
m
p
l
etion-commit-fixup-squash'
commit
|
commitdiff
|
tree
2011-10-18
Juni
o
C
Hamano
Merge br
a
nch
'ph/push-to-delete-
n
othing'
commit
|
commitdiff
|
tree
2011-10-18
J
u
n
io C Ham
a
no
Merge
b
ranch 'jc/ch
e
cko
u
t-from-tree-keep-local-chang
e
s'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
Merge branc
h
'js/bise
c
t-no-checkout'
commit
|
commitdiff
|
tree
2011-10-17
Junio C Hamano
resolve_gi
t
l
ink_p
a
cked_ref(): fix mi
s
mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Upda
t
e draft release notes to
1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Ham
a
no
Me
r
ge g
i
t
:
//repo
.
o
r
.
cz/g
i
t-gu
i
commit
|
commitdiff
|
tree
2011-10-16
Juni
o
C
Hamano
Sync with maint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
Ju
n
io
C
Hamano
P
repare for 1
.
7
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Haman
o
Merge branch
'ms/pa
t
ch-id-
w
ith-
o
v
e
rlong-line' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merge bran
c
h 'jc/
m
a
i
nt-bundle-too-qu
i
et'
into maint
commit
|
commitdiff
|
tree
2011-10-16
Jun
i
o
C Hamano
Me
r
ge bran
c
h 'jk
/
f
i
l
t
e
r-branch
-
r
e
quire-clean-wor
k
-tree
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Ju
n
io
C
H
am
a
no
Merge br
a
n
c
h 'j
c
/main
t
-
f
sck-fwr
i
te-size-
c
heck' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Juni
o
C
Hamano
Merg
e
branch 'b
k
/ancestry-path
'
into maint
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
M
e
r
g
e branch
'
jk/main
t
-fetch-s
u
b
m
o
du
l
e-chec
k
-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Juni
o
C Hamano
M
e
r
ge
b
ranch 'tr/mergetool-val
g
rind' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-10-16
J
u
n
i
o
C
H
amano
Me
r
ge bran
c
h 'nm/grep-o
b
ject-sha1-l
o
ck' i
n
to
main
t
commit
|
commitdiff
|
tree
2011-10-16
Jun
i
o C Hamano
Merg
e
branch '
j
c
/
di
f
f-index-unpack' i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
M
e
r
g
e bran
c
h 'mm/rebase-i-exec-e
d
it'
int
o
m
aint
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merge branch '
j
c
/grep
-
unt
r
acked-e
x
clude'
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merge bra
n
ch 'jc/
m
a
int-gr
e
p-un
t
racked-ex
c
lude'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-10-14
Junio
C Hamano
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Upd
a
te draft rel
e
a
s
e notes to 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Merge br
a
nch 'js/maint-merge-one-file-
o
sx-expr
'
commit
|
commitdiff
|
tree
2011-10-14
Juni
o
C
Hamano
Merge branc
h
'jn/ident-fr
o
m-et
c
-
m
ai
l
n
am
e
'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Merg
e
branch 'il/archive-
e
rr-
s
i
gnal'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Merge branch 'jc
/
gr
e
p-untracked-e
x
c
l
ude'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Merge
b
r
an
c
h
'rs/diff-cle
a
nup
-
recor
d
s-fix'
commit
|
commitdiff
|
tree
2011-10-14
Jun
i
o
C Ha
m
ano
Mer
g
e b
r
anc
h
'rs/
p
e
nding'
commit
|
commitdiff
|
tree
2011-10-14
J
unio
C
Ham
a
no
Merge branc
h
'j
n
/no-g-plu
s
-s-on-bsd'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Merge
branch 'jc/is-
u
rl-simplif
y
'
commit
|
commitdiff
|
tree
2011-10-14
J
u
nio
C
Ham
a
no
M
e
rge branch 'nd/g
i
t
-daemon-error-msgs'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Me
r
ge
branch 'n
d
/daemon-log
-
sock-err
o
r
s
'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Merge br
a
nch 'cp/git-
w
eb-browse-browsers'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Ha
m
ano
Merge
b
ranch 'jc/ap
p
l
y-blan
k
-at-
e
of-fi
x
'
commit
|
commitdiff
|
tree
2011-10-14
Junio
C
Ha
m
ano
M
e
r
g
e
b
ranch '
d
i/fa
s
t-import-empty
-
t
ag-note-fix'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Ham
a
no
Merge br
a
nch 'nd
/
maint-aut
o
fix-tag-
i
n-head'
commit
|
commitdiff
|
tree
2011-10-14
Junio C
Hamano
Merge branch 'bw/grep-no-index-
n
o-exclude'
commit
|
commitdiff
|
tree
2011-10-14
J
u
nio C Hamano
M
e
rge branch 'n
d
/mai
n
t-sparse-erro
r
s'
commit
|
commitdiff
|
tree
2011-10-12
Junio
C H
a
m
a
no
Update
draft release not
e
s to 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-12
Junio C Hamano
Merge b
r
anc
h
'cb/do-not-pretend-
t
o-hijack-long-hel
p
'
commit
|
commitdiff
|
tree
2011-10-12
J
u
nio C Hamano
Merge
b
ranch 'sp/smart-http-
f
ailure'
commit
|
commitdiff
|
tree
2011-10-12
J
u
nio C
H
amano
Me
r
ge
b
ranc
h
'nd/document-err-
p
acket'
commit
|
commitdiff
|
tree
2011-10-12
Junio C Hamano
Merge branc
h
'jc/
p
arse-option
s
-boolean'
commit
|
commitdiff
|
tree
2011-10-12
Ju
n
io C Hamano
Merge branc
h
'rs/test-ctype'
commit
|
commitdiff
|
tree
2011-10-12
Junio C Ha
m
ano
Merge
b
ranch 'rs/
n
ame-rev-
u
sage'
commit
|
commitdiff
|
tree
2011-10-12
J
unio C Hamano
Merge branch 'c
s
/perl-config
-
path-se
n
d-em
a
i
l
'
commit
|
commitdiff
|
tree
2011-10-12
Junio C Hamano
M
erge br
a
nch
'
zj/send-email-authen-s
a
sl
'
commit
|
commitdiff
|
tree
2011-10-10
Junio C
H
a
mano
U
pd
a
te
draft
r
e
le
a
se notes to
1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-10
Junio C Hamano
M
erge branch 'dm/tree-
w
alk'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Hamano
M
erge
b
ranch
'
ps/gitwe
b
-js-
w
ith
-
line
n
o'
commit
|
commitdiff
|
tree
2011-10-10
Ju
n
io C Ha
m
ano
Me
r
ge bra
n
ch 'mh/ma
i
nt-no
t
e
s-merge
-
p
a
thbuf-fix'
commit
|
commitdiff
|
tree
2011-10-10
Jun
i
o C Hamano
M
e
rge
b
ra
n
ch 'nd/s
p
ar
s
e-doc'
commit
|
commitdiff
|
tree
2011-10-10
J
u
nio C
H
ama
n
o
M
e
rge
b
ranch 'jp/get-r
e
f-dir
-
u
nsorted'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Haman
o
M
e
rge br
a
nch '
m
h/check-ref-format-3'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Ham
a
no
Merge branch
'mh/iterate-refs'
commit
|
commitdiff
|
tree
2011-10-10
Ju
n
io C Hamano
Mer
g
e
b
ranch '
j
m/mergetool-pathspec'
commit
|
commitdiff
|
tree
2011-10-10
Jun
i
o
C
H
aman
o
Me
r
ge branch 'jc/
m
aint-diffstat-num
s
tat-context'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Ha
m
ano
Merg
e
b
ranch 'mz
/
re
m
ote-rename'
commit
|
commitdiff
|
tree
2011-10-10
Junio C Ha
m
ano
Merge branc
h
'cb/
c
o
mmon-
p
r
e
fix-unification'
commit
|
commitdiff
|
tree
2011-10-10
Jun
i
o C
Ham
a
no
Merge bra
n
ch 'jn/maint-http-erro
r
-message'
commit
|
commitdiff
|
tree
2011-10-10
Ju
n
io C
Hama
n
o
Merge branch '
h
v/
s
ubmodule-update-none'
commit
|
commitdiff
|
tree
2011-10-10
Juni
o
C Hamano
M
e
rg
e
bra
n
ch 'fg/s
u
bmodul
e
-git-file-git-dir'
commit
|
commitdiff
|
tree
2011-10-09
Junio C Ha
m
ano
Makef
i
le: fi
x
permissio
n
s
o
f mergetools/ c
h
ecked out
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-07
J
unio C Hamano
Merge
b
ranch 'js/maint-n
o
-cherry-pick-
h
ead-
a
fter-punte
d
.
.
.
commit
|
commitdiff
|
tree
2011-10-06
Junio
C
Hamano
attr: read core
.
attribut
e
s
f
i
l
e
from git_default_cor
e
_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next