repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sn/diff-doc' into next
2010-11-25
Junio C Hamano
M
erge b
r
anch 'sn/diff-do
c
'
int
o
next
commit
|
commitdiff
|
tree
2010-11-25
Junio
C Hama
n
o
M
e
r
ge
b
ranch 'sp/emfi
l
e' into next
commit
|
commitdiff
|
tree
2010-11-25
Junio
C
Hamano
M
e
rge
branch
'
j
c
/abbrev-guard'
i
nto n
e
xt
commit
|
commitdiff
|
tree
2010-11-25
Junio
C
H
ama
n
o
M
e
r
ge bran
c
h 'nd/maint-fix-add-typo-det
e
c
t
ion'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hama
n
o
Merge branch 'ks/maint-getenv-fix'
into next
commit
|
commitdiff
|
tree
2010-11-25
Junio C Haman
o
Mer
g
e bran
c
h 'j
n
/thinner-wrapper' into next
commit
|
commitdiff
|
tree
2010-11-25
J
unio C Hamano
Merge br
a
nch 'jn/ig
n
or
e
-do
c
' into
next
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hamano
Me
r
g
e
b
r
anch 'jn/gi
t
w
eb-ti
m
e
-hire
s
-comes-
w
ith
-
5
.
8
'
.
.
.
commit
|
commitdiff
|
tree
2010-11-25
Junio C Ham
a
n
o
Me
r
ge branch
'jk/pager-per-
c
ommand' into next
commit
|
commitdiff
|
tree
2010-11-25
Junio
C Hama
n
o
M
e
rg
e
branch 'jk/mai
n
t-decorate-01-bool' into next
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hamano
M
e
rge branch 'gc/http-with-non-ascii-
u
sernam
e
-
url'
.
.
.
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hamano
Merge
branch 'g
b
/
gitweb-remote-head
s
' i
n
t
o
n
ext
commit
|
commitdiff
|
tree
2010-11-25
J
unio C Hamano
Merge branch 'jh
/
not
e
s-merge'
i
nto next
commit
|
commitdiff
|
tree
2010-11-25
Junio
C Hamano
Merge b
r
anch 'pn/commit-
a
ut
o
s
qu
a
sh' into next
commit
|
commitdiff
|
tree
2010-11-25
Ju
n
io C Hamano
Merge branch 'j
j
/ic
a
se-
d
i
r
e
cto
r
y
'
into next
commit
|
commitdiff
|
tree
2010-11-25
J
u
nio C
Hamano
Merge
bra
n
ch '
i
l/remote-fd-ext' into nex
t
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hamano
Merge branch 'master' into nex
t
commit
|
commitdiff
|
tree
2010-11-24
J
unio C Hamano
Merge br
a
nch
'cb
/
m
a
i
nt-
o
rp
h
an-
m
erge-noclobber'
commit
|
commitdiff
|
tree
2010-11-24
J
unio C
H
amano
Merge
b
r
a
nch 'ao/se
n
d-email
-
irt'
commit
|
commitdiff
|
tree
2010-11-24
Junio
C
Ham
a
no
Merge branch 'jk/add-e-doc'
commit
|
commitdiff
|
tree
2010-11-24
Ju
n
io C Haman
o
M
erge branch 'r
s
/o
p
t-help-text
'
commit
|
commitdiff
|
tree
2010-11-24
Junio
C
Hamano
M
erge br
a
nch 'kb/ma
i
nt-rebase-
a
utos
q
uash'
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
M
e
rge bra
n
ch '
m
m
/
phrase-remote-trac
k
ing'
commit
|
commitdiff
|
tree
2010-11-24
Junio C
H
amano
Me
r
ge branch 'en/and-cascade-tests'
commit
|
commitdiff
|
tree
2010-11-24
Junio
C Hamano
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-11-24
Junio
C
Hamano
Mer
g
e b
r
anch 'jl/maint-p
u
ll-
t
ags-doc' into m
a
int
commit
|
commitdiff
|
tree
2010-11-24
Juni
o
C Hamano
Merge bran
c
h '
k
b/mai
n
t-diff-ws
-
check' int
o
maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Me
r
ge
b
ranch
'
jm/m
a
ilma
p
' i
n
to maint
commit
|
commitdiff
|
tree
2010-11-24
Junio
C
H
aman
o
M
e
rge
branch 'tr/maint-git-repac
k
-tmpfile' into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C
H
a
mano
M
e
rge branch 'jk/
m
a
i
nt-appl
y
-no-binary' into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge b
r
anch
'
j
n/send-pa
c
k-er
r
or' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2010-11-24
J
u
ni
o
C Hamano
Merge bra
n
ch 'ak/submo
d
ule-syn
c
' in
t
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2010-11-24
Ju
n
io C Hamano
Merge branch 'jk/maint-rev-list-nul
'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2010-11-24
Ju
n
io
C H
a
mano
Merge branch 'cb/dif
f
-fname-o
p
tim'
i
nto m
a
in
t
commit
|
commitdiff
|
tree
2010-11-24
Junio C
H
amano
Merge b
r
a
n
ch 'jk/no-te
x
tconv-symlink' into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge branch
'dk/maint-blame-el'
i
n
to maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge branch 'aw/git-p4-deletion' into maint
commit
|
commitdiff
|
tree
2010-11-24
Ju
n
io C Hamano
Merge branch 'kf/
p
ost-receive-sa
m
p
l
e
-hook'
i
nto
maint
commit
|
commitdiff
|
tree
2010-11-24
J
unio C Ha
m
ano
Merge branch '
j
k/r
e
pack-reuse
-
o
b
ject
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge
branch 'bc/fix-c
h
erry-pick-
r
oot' into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge br
a
n
ch
'
uk/fix-
a
uthor-ident-sed-script' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
M
er
g
e
branc
h
'a
b
/makefil
e
-track-cc' into mai
n
t
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge branc
h
'
m
g/res
e
t-doc'
into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
M
erge
b
ranch
'tr/send-em
a
il-r
e
fuse-sending-uned
i
ted
.
.
.
commit
|
commitdiff
|
tree
2010-11-24
D
i
ego Elio Pettenò
ima
p
-send: li
n
k
against libcrypto f
o
r
H
M
AC
and othe
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-24
Joe
Pe
r
c
h
es
g
it-send-email
.
p
e
r
l
: Deduplicate "to:" a
n
d "cc
:
" en
t
rie
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-24
Erik
F
a
y
e-Lund
m
ingw: do not se
t
errn
o
to 0 on succe
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge branch 'ef/mingw-dae
m
on
'
commit
|
commitdiff
|
tree
2010-11-19
Ilar
i
Liusvaara
remote-fd/ext: fin
i
shi
n
g
t
ouches
a
f
ter code review
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-18
Junio C Ham
a
no
Update draft release
not
e
s to 1
.
7
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Junio
C Ha
m
an
o
Mer
g
e bra
n
ch 'cb
/
leading-path-re
m
oval' into next
commit
|
commitdiff
|
tree
2010-11-17
Junio
C
Hamano
M
erge branch 'master' into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
M
e
r
ge bran
c
h 'jl/maint-pull-tags-doc'
commit
|
commitdiff
|
tree
2010-11-17
Junio C H
a
mano
Merge
b
ranch '
k
b/maint-su
b
module-savearg
'
commit
|
commitdiff
|
tree
2010-11-17
Jun
i
o C Hamano
Merge
b
ranc
h
'
jk/missi
n
g-
c
onfig'
commit
|
commitdiff
|
tree
2010-11-17
Junio
C H
a
mano
Merge bran
c
h
'k
b
/maint-diff-ws-check'
commit
|
commitdiff
|
tree
2010-11-17
Junio
C Ha
m
ano
M
e
r
ge
b
r
anch 'bg/maint
-
git
w
eb-test-lib
'
commit
|
commitdiff
|
tree
2010-11-17
Juni
o
C Hama
n
o
Merge branch 'jm/mailmap'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Haman
o
Merge branch '
t
r/maint-git-repa
c
k
-tmpfile'
commit
|
commitdiff
|
tree
2010-11-17
J
unio C Hamano
M
e
r
ge branch 'jk/maint-appl
y
-n
o
-binary'
commit
|
commitdiff
|
tree
2010-11-17
Junio C H
a
m
ano
Mer
g
e branch 'jk/
p
us
h
-progress'
commit
|
commitdiff
|
tree
2010-11-17
Junio C
Ha
m
ano
Merge b
r
an
c
h '
t
r
/
maint-merge-
f
ile-
s
ubd
i
r'
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
i
o C Hamano
M
erge
branch 'jn/send-pack-error'
commit
|
commitdiff
|
tree
2010-11-17
Junio C
H
a
mano
Merge branch 'm
g
/make-pro
v
e
'
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
i
o
C Hamano
Merge branch '
k
b
/co
m
p
l
e
tion-c
h
eckout'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge b
r
an
c
h 'sg/
c
ompletion'
commit
|
commitdiff
|
tree
2010-11-17
J
u
n
io C Hamano
Merge branch
's
g
/bisect'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch
'ak/submod
u
l
e-sync'
commit
|
commitdiff
|
tree
2010-11-17
Jun
i
o C Hamano
Me
r
ge br
a
n
ch 'jk/maint-r
e
v-li
s
t-nul'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Me
r
g
e
branch 'ks/
n
o
-textcon
v
-s
y
ml
i
n
k
'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge b
r
anch 'jn/gitweb-
t
est'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'cb/diff-fnam
e
-
o
ptim
'
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
io C H
a
mano
Merge bran
c
h
'jk/no-textconv
-
sy
m
link'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge br
a
nch 'dk/maint-blame
-
el'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Me
r
ge bra
n
ch '
e
f/m
i
ngw-daemon' into next
commit
|
commitdiff
|
tree
2010-11-17
J
unio C Hamano
Merge bran
c
h 'jc/
e
mfile' into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C H
a
mano
Mer
g
e branch 'md/interix' into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch
'jl/add-p
-
reverse-me
s
sage' into next
commit
|
commitdiff
|
tree
2010-11-17
J
unio C Hamano
M
e
rge branch 'jl/cl
o
ne-recurse-s
m
-
synonym'
into next
commit
|
commitdiff
|
tree
2010-11-17
Jun
i
o C H
a
ma
n
o
Merge branch 'jn/cherry-pi
c
k-refres
h
-index' in
t
o
next
commit
|
commitdiff
|
tree
2010-11-17
Juni
o
C Hamano
Merg
e
br
a
nc
h
'
r
r
/ne
e
ds-cle
a
n-work
-
t
r
ee' into next
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C Hamano
Merge branch 'cm/
d
iff-check-a
t
-
e
o
l
'
into next
commit
|
commitdiff
|
tree
2010-11-17
Junio
C
Hama
n
o
M
e
r
ge branch 'fc/apply-p2
-
get-header-name
'
into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge
b
ranch 'jn/f
a
st-import-fi
x
'
into nex
t
commit
|
commitdiff
|
tree
2010-11-17
Junio
C
Hamano
Merge bra
n
ch '
k
b/b
l
ame-a
u
tho
r
-ema
i
l'
into ne
x
t
commit
|
commitdiff
|
tree
2010-11-17
J
unio C H
a
mano
Merg
e
branch 'n
p
/dif
f
-in
-
corrupt-repository' into next
commit
|
commitdiff
|
tree
2010-11-17
Junio
C
H
amano
Merge branch 'np/pack-
b
roken
-
boun
d
ary' into next
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
io
C
Hamano
Merge bra
n
ch
'ak/
a
pply-no
n
-git-epoc
h
' into ne
x
t
commit
|
commitdiff
|
tree
2010-11-17
Junio C
Hamano
Mer
g
e branch 't
c
/smart-http-
p
o
s
t-r
e
direc
t
' into
next
commit
|
commitdiff
|
tree
2010-11-17
Jun
i
o C
H
amano
Merge branch 'en/merge-recur
s
i
v
e' int
o
next
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge
b
r
anch 'master' into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C Ha
m
ano
Merg
e
branc
h
'
ma
i
nt'
commit
|
commitdiff
|
tree
2010-11-17
Brian Gernhardt
t6
0
22: Use -eq not = t
o
te
s
t
out
p
ut of wc -l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
N
guyễ
n
Thá
i
Ngọc Duy
c
lean
:
remove redunda
n
t va
r
iable basel
e
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
a
n
d
Provide 'git merge --ab
o
r
t' as a synonym to 'g
i
t reset
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_
m
erge():
P
arse optio
n
s before chec
k
in
g
MERGE_HEAD
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Provide
'
git notes
g
et-ref' to e
a
s
ily retrieve current
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes merge: Add testcases
for merging notes
t
r
ees
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
t
e
s merge: Add a
n
other auto-r
e
solving strategy
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
n
d
gi
t
notes merge:
--c
o
mmit should fail if underlying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next