repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
unpack-trees: fix "read-tree -u --reset A B" with conflicted index
2012-04-26
Junio
C Hamano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hamano
Syn
c
w
ith
1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
mano
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hamano
Sync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hamano
Git 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
J
unio
C
Hamano
Merge branch 'ma
i
nt-1
.
7
.
8' into ma
i
nt
-
1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ha
m
ano
Merge branch 'jc/maint-
v
eri
f
y-objects-
r
e
m
o
v
e-pess
i
mism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio
C Hamano
Mer
g
e
br
a
nch 'dw/gitweb-doc-grammo' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io
C
Hamano
Merge branch 'tr/ca
c
he-
t
ree
'
into
m
aint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C Hamano
Merge
b
ranch 'cb/maint-t5541-make-
s
erver-port-po
r
table
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'cn/maint-rev
-
list-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
ma
n
o
Merge b
r
anch 'tr/maint-
b
u
ndl
e
-bou
n
dary
'
into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C Haman
o
Me
r
ge
branch '
t
r
/maint-bundle-long-subj
e
ct' into
m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Me
r
ge branc
h
'ph/re
r
er
e
-
doc
'
int
o
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Jun
i
o C Haman
o
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Jun
i
o C Haman
o
M
e
rge br
a
nch 'jc/maint-merge-autoedit' into
maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Git 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C
H
a
m
ano
Merge branch 'jn/maint-fast-i
m
port-empty-ls
'
into maint
commit
|
commitdiff
|
tree
2012-03-26
J
u
nio
C Hamano
Merge b
r
anch 'ph/rerere-
d
o
c
' into maint
commit
|
commitdiff
|
tree
2012-03-26
J
unio C
H
amano
Merge br
a
nch 'ms/
m
ai
n
t-config-error-at-
e
ol-linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Ha
m
ano
Mer
g
e
b
ra
n
ch 'maint-1
.
7
.
8' int
o
m
ain
t
commit
|
commitdiff
|
tree
2012-03-20
J
un
i
o C Hamano
merge: backpo
r
t GIT_MER
G
E_AUTOEDIT
sup
p
ort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C Hamano
Merge b
r
anch 'ks/sort-wildcar
d
-i
n
-makefile' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Jun
i
o
C Hamano
Merge br
a
nch 'jc/advise-i18n' into ma
i
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branch 'jn/gitweb-unspecif
i
ed-ac
t
ion' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Juni
o
C
Hamano
f
etch/receive: remove over-pessimistic
co
n
ne
c
tivit
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Ham
a
no
Git
1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hama
n
o
Merge branch '
t
r/maint-
b
u
ndle-boundary' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-03-12
J
u
n
i
o C H
a
mano
M
e
rge b
r
a
nch '
j
c/main
t
-diff-p
a
tch-header
'
into
m
aint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o
C Ham
a
no
M
e
r
ge branch 'jn/
m
a
i
nt
-
do-not
-
match-w
i
th-unsanitiz
e
d
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
J
u
nio C Hamano
Merge branch 'jc/am
-
3-no
n
s
t
an
d
ard-popt' into maint
commit
|
commitdiff
|
tree
2012-03-06
J
u
n
i
o C
Hamano
Mer
g
e
b
ranch 'maint-1
.
7
.
8
'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-03-06
J
unio C Hama
n
o
M
erge branch 'main
t
-1
.
7
.
7' into
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
H
amano
Git
1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ha
m
ano
Merge branch 'jc/doc-
m
e
r
g
e
-options' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
Ha
m
a
n
o
M
e
rge branch 'cn/main
t
-rev-li
s
t
-
d
o
c
' into maint
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C Hamano
Upda
t
e draft release notes to 1
.
7
.
9
.
3
f
o
r the last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ha
m
a
n
o
M
erge branch 'cn/
m
aint-b
r
anch-with-bad' into maint
commit
|
commitdiff
|
tree
2012-03-05
J
unio
C H
a
m
ano
Mer
g
e
b
ranc
h
'
jn/maint-gitweb-in
v
a
l
i
d
-reg
e
xp' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch
'
n
d
/maint-verify-objects' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge bran
c
h 'jk/ma
i
nt-avo
i
d-
s
treaming-filter
e
d-cont
e
nts
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch 'j
b
/
f
ilter-
i
g
n
o
r
e-sigpipe' in
t
o main
t
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge b
r
an
c
h 'sp/smart-http-f
a
i
l
ure-to-push' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io
C Hamano
Merge branch
'
t
r/
m
aint
-
bund
l
e
-
long-subject' into maint
commit
|
commitdiff
|
tree
2012-03-02
Juni
o
C
Haman
o
Doc
u
m
e
n
tation: do not assume th
a
t
n > 1 in <rev>~$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Ju
n
i
o C
H
amano
diff -p: squel
c
h "diff -
-
g
i
t" he
a
d
er fo
r
sta
t
-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
J
unio C Hamano
t
4011: i
l
lu
s
t
rate "diff-index -p" on stat-dirty paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
J
unio C Hamano
t4011: modernise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Hamano
U
pdate
d
raft
r
eleas
e
notes to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge b
r
anch 'pj/remote
-
set-branches-usag
e
-
f
ix
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Hamano
Merge branch 'jn
/
gitwe
b
-unborn-
h
ead
'
i
n
to maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ham
a
n
o
Merge branch 'jn/
a
ncient-meld-su
p
port' into mai
n
t
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ha
m
ano
Merge bra
n
ch 'tr/me
r
g
e-edit-guidance'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Hamano
t
e
st: "am -3" can acc
e
pt
n
on
-
standard -p<num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hamano
Docum
e
nt accumulated fixes
s
ince 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Hamano
Merge branc
h
'jc/add-
r
efres
h
-unmerged'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ham
a
no
Merge br
a
nch 'js/configure-lib
i
ntl
'
into main
t
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Hamano
Syn
c
with
1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C
H
a
m
ano
Git 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio C Ha
m
ano
Docu
m
e
n
t
merge
.
branc
h
d
es
c
confi
g
uration variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
J
u
nio C Hamano
am -3: allow
n
onstandard -p<
n
u
m>
o
pti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio C Hamano
G
i
t 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-22
Junio C Ham
a
no
Documentation/merge-opti
o
n
s
.
txt: gr
o
up "ff
"
related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C Hamano
Update draft r
e
l
e
ase notes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
J
u
n
i
o C Hamano
Merge branc
h
'cb/r
e
ceive
-
pack-keep-error
s
'
in
t
o maint
commit
|
commitdiff
|
tree
2012-02-21
Junio
C Hama
n
o
Merge branch 'cb/transfer-
n
o-progr
e
ss' into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
M
er
g
e br
a
nch 'jk/git-dir-lo
o
kup' into
maint
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C
H
amano
M
erge branch 'jc/
d
i
f
f-stat-
s
cale
r
' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Ha
m
ano
M
e
r
g
e
branch 'zj/term
-
c
o
lumns' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Ha
m
ano
Mer
g
e branc
h
'cb/
m
aint-rev
-
list-verif
y
-ob
j
ec
t
' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Ju
n
io C Hamano
Merge branch 'cb/maint-t5541-
m
ake-server-port-porta
b
le
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C Hamano
Merg
e
branch 'dp/i18
n
-l
i
bcharset' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio
C Hamano
M
e
rg
e
branch
'jk/grep-
b
inary-attrib
u
te' into
ma
i
nt
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Mer
g
e branch 'nd/diffst
a
t-gramnum' int
o
maint
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C Hamano
Merge br
a
n
c
h 'nd/
f
ind-p
a
ck
-
entry-r
e
cent-ca
c
h
e
-
invalidati
o
n
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge
branch 'tt/profil
e
-bu
i
ld-fix' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C
Hamano
Merge branch
'
fc/zsh-compl
e
t
i
on' into main
t
commit
|
commitdiff
|
tree
2012-02-20
Junio C Hama
n
o
U
p
date draft rel
e
ase
notes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-17
Junio C Hama
n
o
ref
r
e
s
h_index:
d
o not show unm
e
rged path that i
s
outside
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
J
u
n
io
C
H
amano
Upda
t
e draf
t
release n
o
tes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Junio C
H
amano
Merge b
r
anch 'jc/ch
e
ckout-out-of-unborn' int
o
maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C
H
amano
Merge branch 'jc/maint-mailm
a
p-output' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Merge bran
c
h 'jk
/
promp
t
-fallbac
k
-to-tty' into maint
commit
|
commitdiff
|
tree
2012-02-16
Juni
o
C Hamano
Merge b
r
anch 'jn/
g
itweb-sear
c
h-utf
-
8
'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
M
e
rg
e
branch '
j
c/maint-c
o
mmit-ignore-i-t-a' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2012-02-16
J
u
nio
C Hamano
Merge branch 'mm/empty
-
loose
-
error-message'
into maint
commit
|
commitdiff
|
tree
2012-02-16
J
un
i
o C
Hamano
Merge branch 'nk/c
t
ype-for
-
pe
r
f' in
t
o maint
commit
|
commitdiff
|
tree
2012-02-16
J
unio C Ha
m
ano
Merge br
a
nch
'
jx/
i
18n-more-marking' into maint
commit
|
commitdiff
|
tree
2012-02-16
J
unio C Hama
n
o
Merge branch '
r
t
/
c
ompletion-
b
ranch-e
d
it-desc' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-02-14
Junio
C
Haman
o
dif
f
--
s
tat: show bars of s
a
m
e lengt
h
for paths with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
Junio C
Hamano
G
i
t 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hama
n
o
Merge
bran
c
h 'jk/maint-tag-show-fixes
'
into maint
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Merge branch
'bw/inet-pton-
n
top-
c
ompat'
into maint
commit
|
commitdiff
|
tree
2012-02-14
Jun
i
o C
Hamano
Merge branch 'mp/ma
k
e-
c
leanse-x-fo
r
-ex
e
'
i
n
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2012-02-14
Junio C
H
amano
Merge b
r
anch 'jn/merge-no-edit-fix' int
o
m
aint
commit
|
commitdiff
|
tree
2012-02-13
Junio
C
Haman
o
Update draft release
n
otes to 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-13
Junio C Ham
a
no
Merge
b
ranch 'js/add-
e
-su
b
module
-
fix' into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-13
Junio C Hamano
M
e
rge b
r
anch 'jc/parse-
d
ate-raw' into maint
commit
|
commitdiff
|
tree
2012-02-13
Jun
i
o C H
a
man
o
Merge bran
c
h 'jc/
m
erge-ff-only-st
r
o
n
ger-t
h
an
-
signed
.
.
.
commit
|
commitdiff
|
tree
2012-02-13
J
unio C H
a
m
an
o
Merge br
a
nch 'jc/bra
n
c
h
-desc-
t
ypoavo
i
dance' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
next