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-recursive: Split was_tracked() out of would_lose_untracked()
2011-06-01
Junio C
H
amano
Git 1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio
C
H
amano
Merge
b
ranch '
j
k/maint
-
c
o
nfig-ali
a
s-fix' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ha
m
a
n
o
Merge br
a
nc
h
'jc
/
fmt-
r
eq-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C
H
amano
Merge branch 'jk/maint-docs' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ha
m
ano
Merge
bra
n
ch 'jn/doc-remot
e
-
h
elpers'
into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C
H
a
m
a
n
o
Merge branch 'kk/mai
n
t-pre
f
ix
-
i
n-
c
onfig-mak' into maint
commit
|
commitdiff
|
tree
2011-05-31
J
unio C Ham
a
n
o
Start 1
.
7
.
5
.
4 dr
a
ft release
notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
Merge branch 'tr
/
add
-
i-no
-
escape' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Merge branch 'vh/config-intera
c
tive-single
k
ey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio
C
Hama
n
o
Merg
e
branch 'ml/te
s
t-re
a
dme' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hama
n
o
Merge branch
'
ab/i18n-fixup' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hama
n
o
Merge br
a
nc
h
'jc/renam
e
-
d
egrade-cc-to-c' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Mer
g
e bran
c
h 'rr
/
doc-
c
on
t
ent-type' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Me
r
ge branch
'
jm/
m
aint-misc-fix' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-30
J
unio C Hama
n
o
M
erge b
r
anch 'bc/maint-sub
m
o
dule-fix-p
a
rked' into maint
commit
|
commitdiff
|
tree
2011-05-30
J
unio C Hamano
Merg
e
b
r
a
n
c
h
'bc/ma
i
n
t
-a
p
i-doc-par
k
ed'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
Ham
a
n
o
M
e
rge branch 'jn/run-comm
a
nd-erro
r
-failure' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-27
J
u
nio C Hamano
c
o
nfig
.
m
ak
.
in: al
l
ow
"confi
g
ure --sysconfdir=/
e
lse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Git 1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
bra
n
ch 'maint-1
.
7
.
4' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
n
o
M
e
rge
branch 'jk/
g
it-connection-deadlock-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch
'
js
/
main
t
-s
e
nd-pack-s
t
ateles
s
-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merge b
r
anc
h
'j
k
/maint-u
p
load-pack
-
shal
l
o
w' into maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Ha
m
ano
Merge br
a
nch
'jm/
m
aint-di
f
f
-
words-with
-
sbe' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
J
unio C H
a
mano
Merge branch 'kk/maint-pr
e
f
i
x-in-config-mak' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge branch 'mg/diff-uico
n
fi
g
-doc' into
m
ain
t
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C
H
amano
Merge
branch 'ft/gitweb-
t
ar
-
with-
g
zi
p
-n' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge branch 'ss/doc-svn
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio C
Hama
n
o
Merge branch 'jn/f
o
rmat-patch-do
c
' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Me
r
ge branch 'jc/maint
-
pathspec-stdin-and-c
m
dline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C
H
amano
Merge
branch 'jk/cherry-pi
c
k-r
o
o
t
-with-
r
esolv
e
' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Mer
g
e
branch '
r
g/co
p
y
-
gecos-username
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
aman
o
Merge branch
'
fc/completion-zsh' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio C
H
amano
Merge branch 'jk/
g
i
t
-co
n
nection
-
de
a
dlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
branch 'js/ma
i
n
t
-
send-p
a
ck-
s
tateless
-
rpc-dead
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'svn-f
e
-maint' of git://r
e
po
.
or
.
c
z/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
J
u
ni
o
C Hamano
userformat_find_requi
r
ements(): find requi
r
e
m
ent
for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Junio C Hamano
handle_options(): do not miscount how many
a
r
g
u
m
e
nts
.
.
.
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
H
a
mano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Ham
a
n
o
Merge
b
ranch 'js
/
mai
n
t
-
1
.
6
.
6-send-p
a
ck-s
t
ateles
s
-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
U
p
date
d
raft re
l
ease 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 bran
c
h '
j
n/ma
i
nt-format-patch-doc' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merg
e
branch
'
ss/cherry-pick-x-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Ha
m
an
o
Merge branch '
v
r/merge-b
a
se-d
o
c
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o C H
a
man
o
Merge br
a
nch 'sr/m
a
int-fa
s
t-import-tigh
t
en-opt
i
on-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merg
e
bran
c
h 'jc/t1506
-
shell-p
a
ram-expan
s
i
on-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
uni
o
C
Hamano
Merge
b
r
anch 'jc/fix-add-u
-
unmerg
e
d
'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jn/gitweb-dependency'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge
br
a
nch
'
jc/maint-br
a
nc
h
-mergeoptions' into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge br
a
nch 'jc/mai
n
t
-add-p-overlappin
g
-hu
n
ks' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
s
ideband_demu
x
(): fix d
e
cl
-
after-stm
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Update draft relea
s
e no
t
es
t
o
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Mer
g
e branch 'cn/format-patch-quie
t
' into
maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Merge b
r
anch 'j
m
/mer
g
e
t
ool-submo
d
u
l
es' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
an
o
Merge bran
c
h
'j
k
/format-patch-qu
o
te-s
p
ecial-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
erge br
a
nch 'vh/g
i
t-sv
n
-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io C Ha
m
ano
gi
t
_op
e
n_
n
oatime(): drop unused
p
arameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
sha1_file: ty
p
ofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Pre
p
are for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge branch
'
aw/m
a
int-rebase-i-
p
-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Ha
m
a
n
o
Merge
b
r
anch
'
js/blame-parsename
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'
gr/cvsi
m
port-alternative-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C Hamano
M
erge
branch 'cj/p
4
merge' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
M
e
rge b
r
anch 'jk/merge-one-file-working-tr
e
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
a
man
o
Merge
branch 'jc
/
fix-diff-f
i
l
e
s
-
unme
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
anch '
m
z
/ma
i
n
t-rename-unmerg
e
d' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-11
J
un
i
o C Hamano
Merge
branch
'
jc/maint-1
.
7
.
4-pathspec-
s
tdi
n
-and
-
cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jc/maint
-
1
.
6
.
6-paths
p
ec-stdi
n
-
a
nd-cmdli
n
e'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hama
n
o
setup_revisions()
:
take pa
t
hs
p
ec
f
rom command li
n
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ham
a
no
Revert "
H
o
n
or $(
p
refix) s
e
t in config
.
m
a
k* w
h
en defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t1507: avoid "${
p
a
r
am
e
ter<o
p
>'wor
d
'}" inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Ha
m
a
no
t3701: add-p-fix makes t
h
e last tes
t
to
pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
merge: mak
e
branch
.
<name>
.
mergeoptio
n
s correctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Merge branch 'j
s
/maint-1
.
6
.
6-send
-
pack-stat
e
less-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ha
m
ano
t3701: fix here d
o
cument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Ha
m
ano
G
i
t 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge
bran
c
h
'
j
h/d
i
rstat' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch 'sp/main
t
-clear-postfie
l
ds' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Ha
m
ano
M
erge bran
c
h
'jk/maint
-
stash
-
oob' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o C Hamano
M
e
rge
b
ran
c
h 'jk/maint-upload-p
a
c
k
-sh
a
ll
o
w
' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C H
a
m
a
no
Merge
b
ranch 'dm/
s
ta
s
h-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
branch 'jc/pack
-
objects-bigfile' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
a
man
o
Merg
e
branch 'mg/re
f
log-with
-
opti
o
ns' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C
Ha
m
a
no
M
e
rge b
r
anch 'jk/stash-loosen
-
saf
e
ty' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
ni
o
C Ham
a
no
Me
r
ge
bran
c
h 'ar/clean-rmdi
r
-e
m
pty
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C H
a
mano
Merge branch
'
mg/sha1-path-
a
dvise' into maint
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
"add -p": work-around an old laziness that does no
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
a
d
d-
-
interac
t
ive
.
perl:
f
ac
t
or out repe
a
ted -
-
recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
t3701: Editing a split hunk in an
"add -p" session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
mano
add -p: 'q'
s
hou
l
d
re
a
lly quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
Start 1
.
7
.
5
.
1 maintenance t
r
ac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
Merge b
r
anch 'mg/x-years-12-months' int
o
maint
commit
|
commitdiff
|
tree
2011-04-26
J
u
n
i
o
C Ha
m
ano
http: clear POS
T
F
I
EL
D
S when initializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Hamano
Merge bra
n
ch 'js/maint-1
.
6
.
6-s
e
nd-pack
-
stat
e
less-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
G
it 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
F
ix "
a
dd -u"
t
hat s
o
meti
m
es fails to res
o
lve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff-files: show unmerg
e
d
entries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
di
f
f: remov
e
often unu
s
e
d pa
r
a
meters from
d
iff_unmerge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hama
n
o
diff
.
c: return
fil
e
pair from di
f
f
_
unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
m
a
no
tes
t
: use $_z40 f
r
om
t
est
-
lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next