repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
xdiff-merge: optionally show conflicts in "diff3 -m" style
2008-08-31
Junio C
Hamano
x
diff-merge:
optionally show conf
l
i
c
ts
i
n "diff3 -m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C
H
amano
xdl_fill_merge_buf
f
er(): separa
t
e o
u
t
a
t
o
o deep
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
i
o
C H
a
mano
c
t
y
pe
.
c: protect ti
n
y C prepro
c
essor
c
onstants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C
H
amano
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
amano
Merge bra
n
ch
'ag/ma
i
nt-combin
e
-diff-fix' into maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch
'
m
v/ma
i
n
t
-merge-fix' i
n
t
o
maint
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Haman
o
merge: fix n
u
merus b
u
gs
around "
t
rivial merge" are
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
u
n
pack_trees(
)
:
p
ro
t
ect th
e
handcrafted i
n
-core i
n
d
e
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
Update draft relea
s
e
n
otes for 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o
C Hamano
"git-
m
erge":
a
llow fast-f
o
rwar
d
ing in a stat-dir
t
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
compl
e
tio
n
: find out supported
merge s
t
r
a
tegies c
o
rrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hamano
for-each-ref: c
o
pe with tags with
i
n
complete lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Ham
a
n
o
diff --check: do not
get confused by new blank
l
i
ne
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Haman
o
Start 1
.
6
.
0
.
X maintenance series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io C Hamano
GIT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o
C Ham
a
no
Merg
e
git-gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hama
n
o
Merge branc
h
'a
k
/
p4'
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Hamano
Merg
e
gi
t
://git
.
kernel
.
o
r
g
/pub/scm/
g
itk/gitk
commit
|
commitdiff
|
tree
2008-08-14
Jun
i
o
C
Ha
m
ano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
GIT 1
.
6
.
0-
r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-13
Juni
o
C Hamano
D
o
n
o
t talk
a
bou
t
"diff" in rev
-
list documentatio
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Jun
i
o C Hamano
Merge git:
/
/git
.
bogomips
.
or
g
/git
-
svn
commit
|
commitdiff
|
tree
2008-08-12
J
u
n
i
o C Ha
m
ano
d
i
f
f --
c
h
e
ck: do not uncondi
t
ionally
c
omplain abo
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Junio C H
a
mano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hama
n
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio
C Hamano
Re-fix rev
-
lis
t
-options
d
ocument
a
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
Merge b
r
an
c
h
'maint'
commit
|
commitdiff
|
tree
2008-08-11
Junio
C
H
amano
F
i
x d
e
leting reflo
g
entri
e
s from HEAD
reflog
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Hamano
Update
d
raft RelNotes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Ham
a
no
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-09
Junio
C Ha
m
ano
mailinfo: fix MI
M
E
m
ulti-p
a
rt message boundary handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Hamano
GIT-VERSION-GEN:
mark
t
he
version 'dirty' only if ther
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
J
uni
o
C Hamano
ascii
d
oc markup
fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-07
Junio C
H
amano
Merge
b
r
a
nch 'lt/config-fsync' into maint
commit
|
commitdiff
|
tree
2008-08-07
Junio C
H
amano
Merg
e
branch '
j
c/ref
l
og-e
x
pire' in
t
o
main
t
commit
|
commitdiff
|
tree
2008-08-07
Junio C Ham
a
no
Me
r
ge br
a
nch 'ag/rewrite_one' into maint
commit
|
commitdiff
|
tree
2008-08-06
Junio C Ha
m
an
o
GIT 1
.
6
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio C
H
am
a
no
Sync wit
h
1
.
5
.
6
.
5
commit
|
commitdiff
|
tree
2008-08-06
Ju
n
io C
H
a
m
a
n
o
GIT 1
.
5
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Files
given on th
e
c
omma
n
d li
n
e
are relative to $cwd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio C H
a
mano
Merge git://repo
.
o
r
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2008-08-06
J
unio
C Hamano
Mer
g
e git://git
.
kerne
l
.
org
/
pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2008-08-06
Junio C
Hamano
Merg
e
branch 'rs/
a
rchive-parse-options'
commit
|
commitdiff
|
tree
2008-08-06
Junio
C Hamano
f
ix diff-tree -
-
stdin docum
e
ntation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Merge
b
ra
n
ch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2008-08-06
Junio C Ham
a
no
R
el
N
o
t
es 1
.
5
.
6
.
5 updat
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-03
Junio C Hamano
Me
r
ge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-02
Jun
i
o C Hamano
M
er
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hama
n
o
bui
l
tin-n
a
me-rev
.
c
:
split deeply nested p
a
r
t
f
r
om the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
S
t
art 1
.
5
.
6
.
5 RelNotes to
describe accumulat
e
d fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Ha
m
ano
Update my
e
-ma
i
l
add
r
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
Docum
e
ntation:
clarif
y
d
i
ff -
-
cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-02
Junio C Hamano
mak
e
sure parsed wildcard refspec ends with s
l
ash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-31
J
u
ni
o
C
H
amano
Teach --find-copies-harde
r
to "git blame"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
Fix t
e
st
-
p
arse-options "intege
r
" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hama
n
o
Fix merge nam
e
generation i
n
"merge in C"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hama
n
o
Merge git:/
/
re
p
o
.
or
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2008-07-30
Junio C Hamano
Tea
c
h
g
itlin
k
s
to ie_modified() and c
e
_modifie
d
_
c
heck_fs()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Ham
a
no
t
7
00
1
: fi
x
"git mv" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hamano
Docum
e
nt
a
tion: cl
a
rify what is shown in "g
i
t
-ls-files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hama
n
o
ls-tr
e
e d
o
c
um
e
nta
t
i
o
n
:
enhan
c
e notes on su
b
directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Juni
o
C Hamano
Allow installin
g
in the tradition
a
l way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio C
Ham
a
no
Allow buil
d
ing
w
i
thout any git in
s
talled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
J
u
nio C Hama
n
o
GIT 1
.
6
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Juni
o
C
H
ama
n
o
make su
r
e parsed wildcard
r
e
f
s
pec ends with slash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hamano
Merge git://repo
.
o
r
.
cz
/
g
i
t
-gui
commit
|
commitdiff
|
tree
2008-07-25
Juni
o
C
H
amano
M
erg
e
branch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2008-07-25
Junio C Ham
a
n
o
D
ocumentation: cl
a
rif
y
h
ow to disable elements
in core
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C
H
amano
Makefile: fix
she
l
l quoting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio
C
Ham
a
no
tests: pro
p
aga
t
e $(TAR) down from
t
h
e
toplevel
M
akef
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Merge branch '
p
h/
c
h
eck
o
ut'
commit
|
commitdiff
|
tree
2008-07-24
Junio
C
Ham
a
no
Me
r
ge b
r
anch 'maint' int
o
ph/ch
e
ckout
commit
|
commitdiff
|
tree
2008-07-24
Ju
n
io C Ha
m
ano
ignore non-exis
t
e
nt refs in dwim_log()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C H
a
ma
n
o
Documentation: clarify diff --cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C
Haman
o
builtin-branch
.
c: optimize --merged and
-
-no-merged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Haman
o
bu
i
ltin-branch
.
c: remove unused c
o
d
e
in app
e
nd_ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Ju
n
io C Hamano
stash save: fix
p
arameter han
d
ling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Hama
n
o
te
s
ts: do no
t
r
ely on external "patch"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Haman
o
Revert "make g
i
t-st
a
tus us
e
a
pa
g
er"
commit
|
commitdiff
|
tree
2008-07-21
Junio C
Ha
m
ano
Upd
a
te
m
y
e
-mail
a
ddress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Mer
g
e branch
'
ap/trackinfo'
commit
|
commitdiff
|
tree
2008-07-21
Junio
C Hamano
Mer
g
e
br
a
nc
h
'jc/rerere-auto-m
o
re'
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C
Hamano
Merge br
a
n
c
h 'ns/am
-
abort'
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
io C Hama
n
o
M
erge branch
'
j
c
/add-addremove'
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
amano
"needs up
d
a
t
e" con
s
idered harmful
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Move
r
ead_in_
f
ull() and wri
t
e
_
i
n
_full
(
)
t
o wrapper
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Link shell with
c
ompa
t
lay
e
r
fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C
Hamano
Merge bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
refres
h
-
i
n
dex
:
f
i
x bi
t
m
ask assignment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
git-add --all: documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
git-add --al
l
:
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
unio C Hamano
gi
t
-add --all: add
a
ll files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Jun
i
o
C Ha
m
an
o
builtin-add
.
c: r
e
structure the cod
e
for maintaina
b
i
lity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
Gettin
g
cl
o
se
r
to 1
.
6
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Jun
i
o C Ham
a
no
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-07-19
Junio C
H
a
m
ano
.
mailmap
u
p
date
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Ha
m
ano
t900
1
(sen
d
-email): Do not u
s
e hardcode
d
/bin/sh in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C H
a
mano
GIT 1
.
5
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next