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
t6042: Ensure rename/rename conflicts leave index and workdir in sane state
2011-06-01
Junio
C Hamano
Git 1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge
branch 'jk/maint-co
n
fig-alias
-
fix'
into main
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C
Haman
o
Merge branc
h
'jc/
f
mt-req-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge branch 'jk/m
a
int-docs' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C
H
a
mano
M
e
rge branch 'j
n
/doc-remo
t
e-hel
p
ers' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2011-06-01
Ju
n
io
C Hama
n
o
Merge
branch 'k
k
/mai
n
t
-
p
refix-in-config-mak' into maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio
C
Hamano
S
t
art 1
.
7
.
5
.
4 draft release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge
b
ranch 'tr/add-i-no-escape' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io
C H
a
mano
M
erge bra
n
ch 'vh/con
f
ig-in
t
e
racti
v
e-sing
l
e
k
e
y-doc
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
M
e
rge branch '
m
l
/
test
-
readme' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
M
e
rge br
a
n
c
h
'
ab/i
1
8n-fixup' into main
t
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
Mer
g
e
branch 'jc/re
n
ame-degrade-cc-to-c' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Me
r
ge
branch 'rr/doc-c
o
ntent-type' into
m
aint
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io
C Hamano
Mer
g
e branch 'jm/m
a
int-m
i
s
c-fix' into maint
commit
|
commitdiff
|
tree
2011-05-30
J
unio C Ha
m
ano
M
er
g
e br
a
nch 'bc/maint-s
u
b
m
o
du
l
e-fix-parked
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
i
o C
H
am
a
no
Mer
g
e branch 'bc/
m
aint-api-doc-parked
'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-30
Junio C Ham
a
no
Merge
b
ranch 'jn
/
r
u
n-c
o
mmand-er
r
o
r
-
failure'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-27
Junio C
Hamano
config
.
mak
.
in:
a
l
l
o
w
"
co
n
figure
-
-sysconfd
i
r=/else
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io
C Hamano
G
it 1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio
C
Hama
n
o
M
e
r
ge
b
ra
n
ch 'maint-
1
.
7
.
4'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Ha
m
ano
Merge branch 'jk/git-con
n
ect
i
on-deadlock-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
r
g
e branch 'js/maint-send-pa
c
k
-
state
l
es
s
-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
i
o
C Ham
a
no
Merge
b
ranc
h
'
j
k/maint-uploa
d
-pack-shallow' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C H
a
mano
Merge
branch 'j
m
/ma
i
nt-dif
f
-
w
ords-wi
t
h-sbe' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C
H
a
mano
Me
r
ge bra
n
c
h
'kk/maint-pr
e
fix-in-config-mak' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
branch 'mg/diff-uic
o
nfig-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
M
e
rge branch 'ft/gitweb-tar-with-gzip-n
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C
Hamano
Mer
g
e bra
n
ch 'ss/
d
oc-svn' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Merge b
r
anch
'jn/format-patch-
d
o
c' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
J
uni
o
C H
a
mano
M
e
rge branch 'jc/maint-pathspec-
s
tdin-and-cmdl
i
ne'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge branch 'jk/cherry-p
i
ck-root-wit
h
-reso
l
ve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge br
a
nch '
r
g/co
p
y
-gec
o
s-username'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e
branch 'fc/co
m
pl
e
tion-zsh' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jk/g
i
t-connection
-
deadlock-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Ham
a
no
M
e
r
ge branch 'js/maint-sen
d
-pack-s
t
a
t
eless-rpc-
d
e
a
dl
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch '
s
vn-fe-maint' o
f
g
i
t://
r
e
p
o
.
or
.
c
z
/
g
i
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
J
u
nio C Hamano
userformat_find_requiremen
t
s
():
f
ind requirement for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Junio C Ham
a
no
handle_options(): d
o
not
m
iscount how many arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Juni
o
C
Hamano
Merge branch 'js/ma
i
nt-
1
.
6
.
6-send-pack
-
stateless-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Upd
a
te draft release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jn/mai
n
t
-
for
m
at
-
patch-doc'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Me
r
g
e branch 's
s
/cherry-pick-x-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge br
a
nch 'vr/merge-base-doc' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
M
e
rge branch 'sr/maint-fast-impor
t
-tighten-option-pars
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge br
a
nch 'jc/
t
1506
-
shell-param
-
e
xpa
n
s
i
on-g
o
tcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'j
c
/f
i
x
-add-u-un
m
erged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
amano
Merge branch '
j
n/gitwe
b
-dependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
Hamano
Merge branc
h
'jc/ma
i
nt-bran
c
h-
m
e
r
geoptions' into main
t
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Haman
o
Merge branch
'jc/main
t
-add-p-o
v
erlapping
-
hunks' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
sideband_de
m
ux(): fix d
e
cl-
a
f
t
er-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Ham
a
no
Update draft rel
e
ase
n
otes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Me
r
ge b
r
anch 'cn/format-pat
c
h-quiet' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'jm
/
mergeto
o
l
-submo
d
ules'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'jk/format
-
p
a
tch-quote-sp
e
c
ial-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
u
ni
o
C Hamano
M
e
rge bran
c
h
'
vh/git-svn-doc'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_open_noatime(): drop unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C
H
aman
o
sha
1
_
f
i
le
:
typo
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
H
amano
P
re
p
a
r
e for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge
br
a
nch 'aw/maint-rebas
e
-
i-p-
n
o-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ha
m
a
no
M
e
rge b
r
an
c
h
'js/blame-parsenam
e
' i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'gr/c
v
s
i
mport-alternati
v
e-cvspa
s
s
-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bran
c
h 'cj
/
p4merge' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o C Hamano
M
e
rge br
a
nch 'jk/
m
erge-one-file-wo
r
king-tr
e
e' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
H
amano
Merge
branch 'jc/
f
ix-diff-
f
iles-unmerged'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch
'
mz/m
a
int-rename-un
m
erged'
i
nt
o
m
a
in
t
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Haman
o
Merge
branch
'
j
c/maint-1
.
7
.
4-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hama
n
o
Merge bra
n
ch
'
jc
/
m
ain
t
-1
.
6
.
6-pathspec-stdin
-
and-cm
d
line'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
setup_revisions(): take pathspec f
r
om comma
n
d line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Hamano
Revert "Honor
$(pref
i
x) set in config
.
m
ak* when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t1507:
avo
i
d "
$
{para
m
et
e
r
<op>'w
o
rd'}" inside
d
oub
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
unio C Hamano
t3
7
01: ad
d
-
p
-
f
i
x makes
the la
s
t test to p
a
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
a
mano
merge: make branc
h
.
<name
>
.
mergeopt
i
ons co
r
re
c
tly
o
verri
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C
Ha
m
an
o
Merge
b
ranch 'js/maint-1
.
6
.
6-s
e
nd-pack-stateless-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Junio
C Hamano
t3701: fix here docume
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
M
erg
e
br
a
nch 'jh/dirstat' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Me
r
ge br
a
nch 'sp/maint-clear-postfields' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erg
e
bra
n
c
h 'jk/mai
n
t
-stas
h
-oob
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
H
am
a
no
Mer
g
e branc
h
'jk/maint-upload-
p
ack-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
bra
n
ch 'dm/st
a
sh
-
k-i
-
p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e br
a
nch 'jc/
p
ack-objects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branc
h
'
mg/re
f
log-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C H
a
man
o
Merg
e
branch
'jk
/
stash-loosen-safe
t
y
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'ar/clean-rmdir-empty'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o C Hama
n
o
Merg
e
b
r
a
nch 'mg/s
h
a1-path-advis
e
' into maint
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hamano
"add
-p
"
: work-a
r
ound an old laz
i
ness
that
does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio
C
Haman
o
add--interactive
.
per
l
: factor out repeated --recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C
Hama
n
o
t3701
:
Edit
i
ng a
s
p
l
i
t hunk in
a
n "add -p" sess
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
a
dd
-p: '
q
'
should really q
u
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
a
mano
Star
t
1
.
7
.
5
.
1 m
a
inte
n
an
c
e track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Ha
m
ano
Merge b
r
anc
h
'mg/x
-
years-1
2
-mont
h
s' into maint
commit
|
commitdiff
|
tree
2011-04-26
J
u
ni
o
C Hamano
http: clear P
O
STFIELDS when initializing a sl
o
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Hamano
Merge bra
n
ch
'
js/ma
i
nt-1
.
6
.
6-s
e
nd-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
J
unio C
H
amano
Gi
t
1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
Fix "a
d
d -u"
t
hat
sometime
s
fai
l
s to reso
l
ve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
diff-
f
iles
:
show unmerged
entri
e
s
corr
e
ct
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: re
m
ov
e
often unused pa
r
am
e
ters from
d
iff_u
n
merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C
Hamano
diff
.
c
:
ret
u
rn filep
a
ir from di
f
f_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hamano
te
s
t:
u
se $_z40 from tes
t
-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next