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
rebase: improve error messages about dirty state
2008-09-20
Junio C Haman
o
Start draft rele
a
se notes for 1
.
6
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Juni
o
C Hama
n
o
Merge branch
'
bc/m
a
int-diff-hunk-header-fix' into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-19
J
unio C Hamano
Merge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
M
erg
e
branch 'jc/diff-prefix'
commit
|
commitdiff
|
tree
2008-09-19
Junio C Ha
m
ano
M
e
r
g
e
branch 'np/pack'
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
M
erge
b
r
a
n
ch 'bw/sho
r
tref'
commit
|
commitdiff
|
tree
2008-09-19
Junio C
Hamano
Me
r
ge branch 'r
s
/
d
ecorate'
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
M
e
rge
branch 'tr/rev-list-rev
e
rs
e
'
commit
|
commitdiff
|
tree
2008-09-19
J
unio C Haman
o
Merge
b
r
anc
h
'cc/bisect'
commit
|
commitdiff
|
tree
2008-09-19
Ju
n
i
o
C
Ha
m
ano
Merge branch 'jc/
s
e
t
l
i
n
ebuf
-
setvbuf'
commit
|
commitdiff
|
tree
2008-09-19
Junio
C Hamano
Merge branch '
d
p
/
m
aint-re
b
ase-fix
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2008-09-19
Junio C
H
a
mano
Merge branch 'jc/maint-checkout-keep-remove' i
n
to maint
commit
|
commitdiff
|
tree
2008-09-19
Juni
o
C Ham
a
n
o
M
e
rge branch 'jc/m
a
int-d
i
ff-q
u
iet' into
mai
n
t
commit
|
commitdiff
|
tree
2008-09-19
J
u
nio
C Haman
o
M
erge branch
'jc
/
maint-
n
ame-
h
ash-c
l
e
a
r' into maint
commit
|
commitdiff
|
tree
2008-09-19
Junio
C Ha
m
ano
Merge branch 'jc/maint
-
template-permbits' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Me
r
g
e bra
n
c
h
'mh
/
maint
-
honor-no-ssl-v
e
rify' into main
t
commit
|
commitdiff
|
tree
2008-09-18
Junio C Hamano
diff
/
diff-files: do
n
ot use --c
c
too aggressively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-16
Junio C Ha
m
ano
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-09-16
J
u
nio C
Hamano
Merg
e
b
ranch 'dp/maint-re
b
ase-fix'
commit
|
commitdiff
|
tree
2008-09-16
Junio C Hama
n
o
Merge branch 'j
c
/maint-c
h
eckout-
k
eep-remo
v
e
'
commit
|
commitdiff
|
tree
2008-09-16
J
un
i
o C Ham
a
no
M
e
rge branch
'
jc/maint-diff-qui
e
t'
commit
|
commitdiff
|
tree
2008-09-16
Junio C Hamano
Me
r
ge branch 'jc/maint-n
a
me-hash-cle
a
r'
commit
|
commitdiff
|
tree
2008-09-16
Junio C Hamano
Merge branch 'jc/
m
a
int-template-
p
e
rmbits'
commit
|
commitdiff
|
tree
2008-09-16
Junio C Hamano
Merge branch 'mh
/
mai
n
t-honor-no-ssl-verify'
commit
|
commitdiff
|
tree
2008-09-13
Junio C
H
a
m
a
no
Sync
with 1
.
6
.
0
.
2
commit
|
commitdiff
|
tree
2008-09-12
Junio C H
a
mano
GIT 1
.
6
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-12
Jun
i
o C Hamano
Merge branch 'ho/mai
n
t-d
a
shless'
i
nto maint
commit
|
commitdiff
|
tree
2008-09-10
Jun
i
o C H
a
mano
F
i
x git-diff-tree
--stdin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-10
Junio C
H
amano
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-09-10
Junio C Hamano
Update draft release not
e
s for 1
.
6
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-10
Junio C Hamano
M
erge branch '
j
c
/
maint-log-grep'
in
t
o maint
commit
|
commitdiff
|
tree
2008-09-10
Junio
C Hamano
Me
r
g
e branch 'jc/m
a
int-hide-cr-in-di
f
f-fro
m
-
less' into
.
.
.
commit
|
commitdiff
|
tree
2008-09-10
Junio C Hamano
Merge br
a
nch
'
jc/mai
n
t-check
o
ut-fi
x
' int
o
maint
commit
|
commitdiff
|
tree
2008-09-10
J
u
nio C
H
am
a
no
Merge branch 'np/maint-safer-pack' into maint
commit
|
commitdiff
|
tree
2008-09-10
J
unio C
H
aman
o
Merge branch 'ho/
d
ashless'
commit
|
commitdiff
|
tree
2008-09-10
J
u
nio C Hamano
ch
e
ckout: do not lo
s
e staged
r
em
o
v
al
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio C
Ham
a
n
o
Fix p
e
rm
i
ssion bits on sourc
e
s ch
e
cked ou
t
w
ith a
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio C
Hama
n
o
push: recei
v
er
e
nd a
d
vert
i
ses
r
efs from alternate repo
s
itories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio C Hama
n
o
pus
h
: pr
e
p
are se
n
der
to rece
i
ve
extended ref information
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio
C
Hamano
r
e
ceive-pack:
make it
a
b
uiltin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio C Hamano
is_directory():
a
generic helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-08
Ju
n
io
C Hamano
Merge git:
/
/
git
.
bo
g
omips
.
org/git
-
sv
n
commit
|
commitdiff
|
tree
2008-09-08
Junio C Hamano
Merge branc
h
'ar/autospell'
commit
|
commitdiff
|
tree
2008-09-08
Junio C Hamano
Merge br
a
n
c
h 'jc/c
c
-ld-d
y
npath'
commit
|
commitdiff
|
tree
2008-09-08
J
u
n
io
C
Ham
a
no
Merge b
r
anc
h
'jc
/
hide-cr-in-diff-from-less
'
commit
|
commitdiff
|
tree
2008-09-08
Juni
o
C Hama
n
o
Merge branch 'jc/maint-ch
e
c
k
o
u
t-fix'
commit
|
commitdiff
|
tree
2008-09-07
Junio C Ham
a
no
Don't verify
h
ost n
a
me in SSL
certs
when GIT_SSL
_
NO_VERIFY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
J
u
n
i
o
C Hamano
da
e
mon
.
c: a
v
oid
s
et
l
inebuf()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Ju
n
io C Hamano
Upda
t
e
draft
r
elease notes fo
r
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Jun
i
o
C
Hamano
M
e
r
g
e git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2008-09-07
Junio C Hamano
diff
-
-q
u
iet: make it
synonym to --exit-code >/d
e
v
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Juni
o
C H
a
m
a
no
dif
f
Po
r
celain: do not disable auto index
ref
r
e
shing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
J
un
i
o
C
Haman
o
git
-
apply:--inclu
d
e=pathspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Jun
i
o C
Haman
o
M
e
rge
u
p
dated g
i
t-gui a
n
d
g
itk t
h
a
t call
each othe
r
commit
|
commitdiff
|
tree
2008-09-06
J
u
ni
o
C
Ham
a
no
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2008-09-06
Junio
C
Hamano
Update draft release n
o
tes for 1
.
6
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-06
J
u
nio C
H
a
mano
stash:
refresh th
e
index
bef
o
re deciding if the work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-06
Junio C Hamano
Me
r
g
e
branch 'maint' of
git
:
//repo
.
or
.
cz/git-gui
into
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
Junio C
H
amano
Mention
t
he fact
t
h
a
t
'
git a
n
notate' is only
for backw
a
rd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Junio
C Hamano
"blame -c" should be
c
om
p
atible with "annotate"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Jun
i
o
C Ham
a
no
Merge branch 'jc/
m
aint-log-g
r
ep'
commit
|
commitdiff
|
tree
2008-09-05
Juni
o
C Hama
n
o
l
o
g --au
t
hor/--co
m
mitter: rea
l
l
y
m
at
c
h
o
nly with
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
Junio C
H
amano
d
iff
-
-cu
m
ul
a
tive
i
s
a s
u
b
-
option of --dirstat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
Junio
C
Ha
m
ano
s
af
e
_create_le
a
ding_directo
r
ies(): make it about "leading
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
U
pdate draft rele
a
se notes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
J
u
n
i
o C Hamano
Merge
branch 'main
t
'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hama
n
o
S
t
art 1
.
6
.
0
.
2 m
a
intenanc
e
c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
J
u
nio C Haman
o
Merge bra
n
ch 'nd/worktree'
in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
M
er
g
e
b
r
anch 'ho/dash
l
ess'
into mai
n
t
commit
|
commitdiff
|
tree
2008-09-03
Junio
C Hamano
Merge branch
'
tr/
f
ilter-br
a
n
c
h'
commit
|
commitdiff
|
tree
2008-09-03
Ju
n
io C Hamano
Merge
branch 'np/maint-safer
-
pack'
commit
|
commitdiff
|
tree
2008-09-03
Juni
o
C Haman
o
Merge
branch 'rf/man-env
'
commit
|
commitdiff
|
tree
2008-09-03
Junio C
Hamano
Merg
e
branch 'jc/author-nick
n
ame'
commit
|
commitdiff
|
tree
2008-09-03
J
u
nio C Ham
a
no
Mer
g
e branch 'dp/p
i
d-uint
m
ax'
commit
|
commitdiff
|
tree
2008-09-03
Junio
C
Hamano
Merge branch
'maint
'
commit
|
commitdiff
|
tree
2008-09-03
Juni
o
C H
a
mano
M
e
r
ge branch 'np/maint-sa
f
er-pa
c
k' into
n
p/pack
commit
|
commitdiff
|
tree
2008-09-01
Junio C Hamano
git-
m
er
g
e doc
u
ment
a
t
i
on: d
e
s
cr
i
be h
o
w conflict is pres
e
nted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
Junio
C Hamano
c
h
eckout --conflict=<style>: re
c
r
eate me
r
ge in a non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
Junio C Ham
a
no
Merge bra
n
ch
'
t
r/rev-list-docs' i
n
to tr/fil
t
er-bran
c
h
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C
H
a
m
ano
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
git-
a
dd --intent-
t
o-a
d
d (
-
N)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
H
aman
o
'
git fo
o
'
progra
m
i
d
entifi
e
s itse
l
f without dash i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
uni
o
C Hamano
git commit --author=
$
n
a
me: look
$
name up in existin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
n
io C
H
amano
d
i
f
f:
vary default
prefix depending
o
n what are compare
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C Ha
m
ano
d
iff: Help
"
less" hide ^M from the
output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
unio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Hamano
g
itattributes: -crl
f
is not bi
n
ary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ham
a
n
o
checkout -m:
recreate merge when c
h
ec
k
ing out of unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ha
m
ano
Mer
g
e
br
a
nch 'jc/
m
aint-checkout-fi
x
' into 'jc/better
.
.
.
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C Hamano
gi
t
-merge-recursive: le
a
r
n
to honor merge
.
conflictstyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
mer
g
e
.
c
onf
l
ictstyle: choo
s
e between "merge
"
an
d
"dif
f
3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
rerere
:
underst
a
nd
"
d
if
f
3 -m" style con
f
l
ic
t
s with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
rerere
.
c: use symbolic c
o
nsta
n
ts to keep track of pa
r
s
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C H
a
mano
xmerge
.
c: "diff3 -m"
s
tyle clips
m
e
rge re
d
uction l
e
vel
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
ni
o
C Hamano
x
m
erge
.
c: m
i
n
imum re
a
dabi
l
i
t
y fixups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Ha
m
ano
xdiff-merge
:
optionally show
conflict
s
i
n
"
diff3 -m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C
Hamano
xdl_
f
ill_merge_buffer(): separate out a too
deeply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
amano
c
heckout --
o
u
r
s/--t
h
eirs: allow checking out
o
ne side
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hama
n
o
c
h
eckout -f: allow ign
o
rin
g
u
nmerge
d
path
s
w
h
e
n
ch
e
cking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Hamano
checkout: d
o
not check out unmerg
e
d hi
g
her stages r
a
ndomly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next