repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'nd/maint-fix-add-typo-detection' into next
2010-11-25
Junio C Hama
n
o
Merge branch 'nd/maint-fix-add-typo-detection' into
.
.
.
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hamano
Merge
b
ranch
'
ks/ma
i
n
t-ge
t
env-fix' i
n
to next
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hamano
Merge branch 'jn/thinner-wrapper' into
next
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hamano
Merge branch
'jn/ignore-doc
'
into n
e
xt
commit
|
commitdiff
|
tree
2010-11-25
Junio
C
Hamano
M
e
r
ge
b
ran
c
h
'
j
n/gitweb-time-hir
e
s-co
m
e
s
-with-5
.
8'
.
.
.
commit
|
commitdiff
|
tree
2010-11-25
Junio
C H
a
mano
Merge branch 'j
k
/pager
-
per-c
o
mm
a
nd' into next
commit
|
commitdiff
|
tree
2010-11-25
Junio
C Hamano
Me
r
g
e b
r
anch 'jk
/
m
aint-decora
t
e-01-bool' into next
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hama
n
o
Merge branc
h
'gc
/
http-wit
h
-non
-
a
s
cii-username-ur
l
'
.
.
.
commit
|
commitdiff
|
tree
2010-11-25
Junio C Ha
m
ano
Mer
g
e branch 'gb/git
w
eb-remote
-
heads' into next
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hama
n
o
Merge branch 'jh
/
notes-merge' into
n
e
xt
commit
|
commitdiff
|
tree
2010-11-25
J
u
nio C Ha
m
ano
M
erge
b
ranch 'pn/co
m
m
i
t
-a
u
to
s
quash' into next
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hamano
M
e
r
g
e branch '
j
j/
i
case-dir
e
ctory' int
o
next
commit
|
commitdiff
|
tree
2010-11-25
Ju
n
io C Ha
m
ano
Merge b
r
an
c
h 'i
l
/remote-fd-ext' into
n
ext
commit
|
commitdiff
|
tree
2010-11-25
Junio C H
a
m
a
n
o
Merge
branch 'm
a
ster' int
o
n
ext
commit
|
commitdiff
|
tree
2010-11-24
J
u
nio C Ha
m
ano
Merg
e
branch 'cb/maint-orphan-merge-noclobber'
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Mer
g
e branch
'
ao/send-email-
i
rt'
commit
|
commitdiff
|
tree
2010-11-24
J
u
n
io
C
Hamano
Merge br
a
nc
h
'
j
k
/add-e-doc'
commit
|
commitdiff
|
tree
2010-11-24
Junio
C
Ha
m
ano
M
e
rge branch 'rs/opt-help-text'
commit
|
commitdiff
|
tree
2010-11-24
Junio C
Hamano
Merge br
a
n
c
h 'kb/ma
i
nt-r
e
base-autosq
u
ash'
commit
|
commitdiff
|
tree
2010-11-24
J
u
nio C Hamano
Merge branch
'
mm/
p
hrase-remote-tracking'
commit
|
commitdiff
|
tree
2010-11-24
J
u
n
i
o C Hamano
Merge b
r
anc
h
'
en/
a
nd-cascade-tests'
commit
|
commitdiff
|
tree
2010-11-24
Juni
o
C
H
amano
Merge bra
n
ch
'
mai
n
t'
commit
|
commitdiff
|
tree
2010-11-24
Junio
C Hamano
Mer
g
e
br
a
nch
'jl/main
t
-pull
-
tags-doc' into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge bran
c
h 'kb/m
a
int-diff-ws-check' into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio
C
Hamano
Merge branch 'jm/mail
m
ap' into maint
commit
|
commitdiff
|
tree
2010-11-24
Ju
n
io
C
H
a
mano
Merge branch 'tr/maint-
g
i
t
-repack-tm
p
f
i
le
'
int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge bran
c
h
'j
k
/maint-a
p
ply-no-b
i
n
a
ry
'
into maint
commit
|
commitdiff
|
tree
2010-11-24
J
u
nio C Hamano
Merge branch 'jn/sen
d
-pack-error' into maint
commit
|
commitdiff
|
tree
2010-11-24
Jun
i
o C Hamano
Merge branc
h
'ak/submod
u
le-sync' into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Me
r
g
e
branch '
j
k/
m
aint-rev-list-nul' into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C
H
a
mano
Merge
b
ranch 'cb/d
i
f
f
-
f
n
a
m
e
-opti
m
'
int
o
m
aint
commit
|
commitdiff
|
tree
2010-11-24
Juni
o
C Haman
o
Merge b
r
anch 'jk/no-textconv-symlink' into maint
commit
|
commitdiff
|
tree
2010-11-24
J
u
nio
C
Haman
o
Merge branch 'dk/maint-blame-el' int
o
m
a
int
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
M
e
rge br
a
nch
'
a
w/git-p4-delet
i
on'
into m
a
int
commit
|
commitdiff
|
tree
2010-11-24
Junio C
H
a
m
ano
Merge branch 'kf/post-rece
i
ve-sample-hook' into mai
n
t
commit
|
commitdiff
|
tree
2010-11-24
Junio C H
a
mano
M
e
r
ge branch 'jk/repack-reuse-object
'
into mai
n
t
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge branc
h
'
bc/f
i
x-cher
r
y-pick
-
root' into maint
commit
|
commitdiff
|
tree
2010-11-24
Juni
o
C
Hamano
Merge
b
ra
n
ch 'u
k
/fi
x
-author-
i
dent-sed-scrip
t
' into
.
.
.
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge branch 'ab/makefi
l
e-t
r
ack-c
c
' into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Mer
g
e branch 'm
g
/rese
t
-doc' int
o
maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge branc
h
'tr/sen
d
-ema
i
l-refuse-
s
ending-uned
i
ted
.
.
.
commit
|
commitdiff
|
tree
2010-11-24
Diego Elio Pettenò
imap-send: link against lib
c
rypto for HMAC and o
t
hers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-24
Joe Perches
g
it-send-email
.
perl: Deduplicate "to:"
and "cc:" entr
i
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-24
Erik
F
aye-Lund
mi
n
gw: do not s
e
t errno
t
o
0
on
s
uccess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-24
Jun
i
o C Hamano
Me
r
g
e
b
r
anch 'ef/m
i
ngw-daemon'
commit
|
commitdiff
|
tree
2010-11-19
Ilari Liusvaara
remote-f
d
/ext:
f
inis
h
ing touches after code r
e
view
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-18
Junio C Hamano
Update
d
raft release no
t
es
to
1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
M
erg
e
branch 'cb/leading-p
a
th-remo
v
al' into
n
e
xt
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
i
o
C Hamano
Merge branch '
m
aster' into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C
H
a
m
ano
Merge
b
r
an
c
h 'jl/maint-pull-tags-doc'
commit
|
commitdiff
|
tree
2010-11-17
J
u
n
i
o C Haman
o
Merge b
r
anch 'kb/main
t
-submodu
l
e-savearg'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branc
h
'jk/mi
s
sing-config'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'kb/ma
i
nt-diff-w
s
-check'
commit
|
commitdiff
|
tree
2010-11-17
J
u
n
io C Hama
n
o
Mer
g
e branch 'bg/maint-gitweb
-
test-lib'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Mer
g
e
branc
h
'jm/
m
ailm
a
p'
commit
|
commitdiff
|
tree
2010-11-17
Junio
C
Hamano
Merge branch 'tr/maint-git-repack-tmpfile'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branc
h
'jk/maint-apply-no-binary'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hama
n
o
Merge bran
c
h
'jk/push-progres
s
'
commit
|
commitdiff
|
tree
2010-11-17
Junio
C
H
am
a
no
M
e
rge br
a
nch 'tr/maint-merge
-
file-subd
i
r
'
commit
|
commitdiff
|
tree
2010-11-17
J
unio
C
Hamano
M
e
rge branch 'j
n
/send-p
a
ck-
e
rror
'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Ha
m
ano
Merge branch
'mg/make-
p
rove'
commit
|
commitdiff
|
tree
2010-11-17
Junio C
Ham
a
no
Me
r
ge bra
n
ch
'
kb/completion-checkou
t
'
commit
|
commitdiff
|
tree
2010-11-17
Jun
i
o
C
Hama
n
o
Merge branch 'sg/com
p
l
e
t
i
on'
commit
|
commitdiff
|
tree
2010-11-17
Jun
i
o C Ham
a
no
Me
r
ge
branch 'sg/bisect
'
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
i
o
C
Hamano
M
erge b
r
anch 'ak/su
b
mod
u
le-sy
n
c
'
commit
|
commitdiff
|
tree
2010-11-17
J
unio C Hamano
Merg
e
branc
h
'
j
k/maint-rev-list-nul'
commit
|
commitdiff
|
tree
2010-11-17
Junio
C
Hamano
Merge br
a
nch
'
ks/no-t
e
xtconv-symlink'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merg
e
branch 'jn/gitweb-test'
commit
|
commitdiff
|
tree
2010-11-17
Juni
o
C
Hamano
Merge branch 'cb/di
f
f-fname-opt
i
m'
commit
|
commitdiff
|
tree
2010-11-17
J
unio C Haman
o
Merge bran
c
h '
j
k/
n
o-textconv
-
sym
l
i
n
k'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'dk/mai
n
t-blame-el'
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
io C
H
amano
Merge
b
r
a
nc
h
'
e
f/mingw-daemon' into n
e
x
t
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C Hamano
Merge branch 'j
c
/emfile' i
n
to next
commit
|
commitdiff
|
tree
2010-11-17
Junio C
H
amano
Me
r
ge branch 'md/in
t
erix'
into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Me
r
g
e bran
c
h 'jl/ad
d
-p-reverse-message' in
t
o
next
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
io C
Haman
o
Merge branch 'jl/clone-recurse-sm-synonym' in
t
o n
e
x
t
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch
'jn/c
h
erry-pick
-
re
f
resh-index'
i
n
t
o next
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C Hamano
Merge bran
c
h
'rr/needs-clean
-
work-tr
e
e' i
n
to
n
ext
commit
|
commitdiff
|
tree
2010-11-17
J
unio C
H
a
mano
Merge branch 'cm
/
diff-check-at-eo
l
' int
o
next
commit
|
commitdiff
|
tree
2010-11-17
J
un
i
o C Ham
a
no
Merge branch 'fc/apply-p2-get-hea
d
e
r
-name' into next
commit
|
commitdiff
|
tree
2010-11-17
Jun
i
o C Hamano
Merge branch 'jn/fas
t
-import-fix
'
into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge
b
ranch
'kb/blame-author-email' in
t
o
next
commit
|
commitdiff
|
tree
2010-11-17
Jun
i
o
C Hamano
Mer
g
e branch 'np/d
i
ff-
i
n-corrupt
-
r
epositor
y
' into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C Ham
a
no
Merge branch 'np/pac
k
-
broken
-
boun
d
ary'
into n
e
xt
commit
|
commitdiff
|
tree
2010-11-17
Junio C H
a
mano
Merge bra
n
ch
'ak/appl
y
-non-git-epoch' into next
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
i
o
C Hamano
Merge br
a
nch
'tc/sma
r
t-http-post
-
redirect' int
o
next
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C Ham
a
no
Merge branch 'en
/
merg
e
-recursive'
i
nto
next
commit
|
commitdiff
|
tree
2010-11-17
Juni
o
C Hamano
Merge branch 'mas
t
er' into
n
ext
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio
C
H
a
m
ano
Merge branc
h
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2010-11-17
B
rian Ger
n
hardt
t6022: Use -eq
n
o
t = to te
s
t output of
w
c -l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Nguyễn Thái Ngọc Du
y
cl
e
a
n
: remo
v
e
redundant variable
baselen
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git mer
g
e
--abort' as
a
synonym to 'git
reset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
cmd_merge(): Parse
option
s
before c
h
eckin
g
MERGE_HEA
D
-
Junio C Hamano
: fixup minor style issues
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
P
ro
v
ide 'gi
t
n
ote
s
get-ref' t
o
easily retri
e
v
e
current
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git
notes
m
erge: Add testcases fo
r
me
r
ging notes trees
.
.
.
-
Junio C Hamano
: Portability: Don't string-compare...
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes merge:
A
dd another auto-re
s
olvin
g
stra
t
egy
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
He
r
land
git notes merge: --commit should fail if underlying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
g
i
t notes merge: Li
s
t co
n
flicting
n
o
tes in note
s
merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
nd
gi
t
not
e
s merge:
M
a
n
ual
c
onflict resol
u
t
io
n
, part 2/
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
M
anual conflict resol
u
t
i
on, part 1/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next