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: fix numerus bugs around "trivial merge" area
2008-08-24
J
u
nio C Hamano
merge:
fix numer
u
s bugs
around "trivial merge" are
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o
C Haman
o
unpa
c
k_trees()
:
protect
the han
d
crafte
d
i
n-core i
n
dex
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hamano
Update draf
t
re
l
eas
e
notes for
1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hamano
"git-merge": allow
fast-forward
i
ng i
n
a
s
tat-di
r
ty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
comple
t
ion: find out supported merge strat
e
g
ies correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hamano
for-eac
h
-r
e
f: cope
with tags wit
h
incompl
e
te lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
diff --check: do
n
ot get confused by new
b
lan
k
lines
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Hamano
Star
t
1
.
6
.
0
.
X
maintenanc
e
series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o
C
H
ama
n
o
GI
T
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-17
J
unio C Ham
a
no
Merg
e
git-gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merg
e
branch
'
ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge git://git
.
kernel
.
o
rg/pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2008-08-14
Junio
C
H
a
mano
Mer
g
e bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2008-08-13
Junio
C
H
amano
G
IT
1
.
6
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
J
unio C Hamano
M
e
rge
b
ranch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2008-08-13
Junio C
Hamano
Do not
t
alk about "
d
iff" i
n
rev
-
lis
t
d
ocumentatio
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-13
Junio C
H
am
a
no
Merge git://
g
i
t
.
bogom
i
ps
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
diff --ch
e
ck:
do
n
ot unc
o
ndit
i
onally
c
o
mplain about
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-12
Junio C Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Jun
i
o
C
H
amano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2008-08-11
Juni
o
C Hamano
Re-fix rev-l
i
st
-
op
t
ions document
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-11
Junio C
Haman
o
Merge
bra
n
ch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2008-08-11
Ju
n
io C Hamano
F
i
x del
e
tin
g
reflog entries from HEAD reflog
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Ha
m
ano
Up
d
ate draft RelNotes
f
or
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-09
Ju
n
io C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-09
Junio
C
H
a
mano
mailinf
o
: fix MIME multi-pa
r
t
message bou
n
dary handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Hamano
GIT-VERSION-GEN:
mark t
h
e
v
ers
i
o
n
'di
r
t
y' only i
f
there
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Ham
a
n
o
asciid
o
c ma
r
kup fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-07
Juni
o
C
H
a
mano
M
e
rge branch 'lt
/
config
-
fsync'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2008-08-07
Ju
n
io C
H
a
m
ano
Merge branch 'jc/
r
eflog-e
x
pi
r
e' i
n
to maint
commit
|
commitdiff
|
tree
2008-08-07
Junio C
H
a
mano
Merge branch 'a
g
/
rewrite_one' i
n
to m
a
int
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
G
IT 1
.
6
.
0-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Ju
n
i
o
C Hamano
Sync with 1
.
5
.
6
.
5
commit
|
commitdiff
|
tree
2008-08-06
Junio C Ham
a
no
G
I
T
1
.
5
.
6
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
F
i
les g
i
ven on th
e
c
ommand lin
e
are
re
l
ative to
$cwd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Merge git://
r
e
p
o
.
o
r
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2008-08-06
Junio C Ha
m
ano
M
e
rge git://git
.
kernel
.
org/pu
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-06
Junio C H
a
mano
Merge br
a
nch 'rs/archive-parse-op
t
ion
s
'
commit
|
commitdiff
|
tree
2008-08-06
Junio C Haman
o
fix
d
if
f
-tree --stdin docu
m
entation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-06
Junio
C
Ham
a
no
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
RelNote
s
1
.
5
.
6
.
5
update
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-03
J
unio C
H
a
ma
n
o
Merge branch '
m
aint
'
commit
|
commitdiff
|
tree
2008-08-02
Junio C Haman
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-02
Junio
C
Hamano
buil
t
in-name-rev
.
c
: split deepl
y
nested part from the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
Merge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-02
J
uni
o
C
H
amano
Start 1
.
5
.
6
.
5 RelNotes
t
o
describ
e
a
c
cu
m
ulated fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
Update my e-m
a
il addres
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Ju
n
io C
Hamano
Docum
e
ntation: clar
i
fy
diff --c
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-02
Juni
o
C Haman
o
m
a
ke sure par
s
ed wi
l
dcard
r
ef
s
pec ends
w
ith
s
lash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-31
Junio
C
Hamano
T
each --find-copies-h
a
r
der to
"git
b
lame"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Jun
i
o C Hamano
Fix te
s
t-parse-optio
n
s
"inte
g
er" test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio C
Haman
o
F
i
x mer
g
e name gen
e
ration
i
n
"me
r
ge
i
n C"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Junio
C
Hamano
M
e
rge g
i
t://repo
.
or
.
c
z/git-gui
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
Te
a
ch gitlinks to ie
_
modif
i
ed() and ce_mo
d
if
i
ed_check_fs()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
J
u
nio C Hamano
t7001
:
fix "git mv" test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hamano
Documentatio
n
: cl
a
rify what is shown in "git-ls-files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Ha
m
ano
ls-tr
e
e documenta
t
ion:
e
nh
a
nce
notes
o
n subdirector
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Hamano
Allow installing in the traditional wa
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Ju
n
i
o C
Hamano
Allow build
i
ng wit
h
ou
t
any git installed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Ju
n
i
o C Hamano
GIT 1
.
6
.
0-r
c
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
J
unio
C Ham
a
no
make sure par
s
ed w
i
l
d
card refspec
e
n
d
s wi
t
h slash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hamano
Merge git
:
//r
e
po
.
or
.
cz
/
gi
t
-gui
commit
|
commitdiff
|
tree
2008-07-25
J
u
nio
C Hamano
Merge
branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2008-07-25
Junio C Ham
a
no
Docu
m
entation: clar
i
fy
h
o
w to disable elements in
co
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Mak
e
fil
e
: fix shell
q
uoting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
t
e
sts: propagate $(TAR) d
o
wn fr
o
m
the toplevel Makefil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Jun
i
o
C Hama
n
o
Merge
b
ranch 'p
h
/c
h
eckout'
commit
|
commitdiff
|
tree
2008-07-24
Junio C Hamano
Merge br
a
nch 'maint' int
o
p
h
/checkout
commit
|
commitdiff
|
tree
2008-07-24
Junio C Hamano
ignore non-existent refs i
n
dwim_log()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Ju
n
io C H
a
mano
Docu
m
entatio
n
: c
l
arify diff --
c
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
J
unio C
Hamano
b
u
ilt
i
n-branch
.
c: opti
m
ize --merged a
n
d --no
-
merged
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
J
u
nio C Hamano
builtin-branch
.
c: remove unu
s
e
d code i
n
append_ref
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Junio C H
a
mano
stash save: fix para
m
eter handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Junio C H
a
mano
tests: d
o
not rely on externa
l
"pat
c
h"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Hamano
Revert "make git-statu
s
use a pa
g
er"
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
io
C Hamano
Updat
e
m
y
e-mail addre
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hama
n
o
Merge branch '
a
p/trackinfo'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Ha
m
ano
Merge br
a
n
ch 'j
c
/rerere-auto-more'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
M
e
r
g
e b
r
anc
h
'ns/am-abort'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Merge branch 'j
c
/add-addre
m
ove'
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
a
m
ano
"needs update" considered ha
r
mful
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hama
n
o
Move read
_
in_full() and write_in
_
fu
l
l()
t
o wr
a
ppe
r
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C H
a
mano
L
i
nk shell
w
i
t
h
compat l
a
yer functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Ham
a
n
o
Me
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-07-20
Ju
n
io C Haman
o
refresh-index: fix bitmask a
s
s
i
gnment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Ham
a
no
git-add --all: docu
m
entation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Juni
o
C Hamano
git-add -
-
all
:
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hama
n
o
g
i
t-add --al
l
: add
all fi
l
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Ham
a
no
builtin
-
add
.
c: restructure the cod
e
f
o
r maintainability
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
J
u
nio C Haman
o
G
e
t
t
in
g
clos
e
r to
1
.
6
.
0-rc
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Ju
n
io C Hamano
Merge
branch '
m
aint'
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
.
mailmap upda
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Ham
a
no
t90
0
1 (
s
end-email): Do not use hardcoded /bin/sh in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
J
u
nio C Hamano
G
IT 1
.
5
.
6
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Ha
m
ano
Merg
e
branch
'sp/ma
i
n
t
-ind
e
x-
p
ack' into maint
commit
|
commitdiff
|
tree
2008-07-18
Junio
C Hamano
ht
t
p-fetch: do not S
E
GV
a
fte
r
fetchi
n
g a bad pack idx
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hama
n
o
re
v
-
l
ist: honor --q
u
iet option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Junio C
H
amano
builtin-
r
e
m
o
t
e
.
c: fix
earlier "skip
_
prefi
x
()"
conver
s
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Juni
o
C Hamano
rerere
.
autoupdate: cha
n
g
e
the message when auto
u
pdate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
mailinfo
:
off-
b
y-one fix for [PATCH
(foobar)] removal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next