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
Merge branch 'ds/uintmax-config' (early part)
2008-08-31
J
u
n
io
C Ha
m
ano
git com
m
it -
-
author
=
$name: look $
n
ame up
i
n existing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
diff: vary default prefix depend
i
ng on
w
hat are
c
ompared
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
unio C Hamano
diff: Help
"less"
hi
d
e ^
M
from the output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
unio
C
Ham
a
no
M
erge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Ham
a
no
gitattributes: -crlf
i
s not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C Hamano
ch
e
ckout -m: recreat
e
mer
g
e
w
hen checking out of unmerg
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C
Hamano
Merge bra
n
ch 'jc/main
t
-checkout-fix' into 'j
c
/be
t
ter
.
.
.
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Ha
m
ano
git
-
m
e
rge
-
r
ecur
s
ive: learn
t
o
h
onor merge
.
c
o
nflictst
y
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
amano
mer
g
e
.
co
n
f
l
i
c
tst
y
le: choose
b
etween
"
merge"
and "
d
iff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C Ham
a
no
rerere: und
e
r
s
tan
d
"diff3 -m"
style conflicts wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ha
m
ano
re
r
e
r
e
.
c: use s
y
m
b
olic constants
t
o
k
eep
t
r
a
ck of parsing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
xmerge
.
c: "diff3 -
m
" sty
l
e clips merge reduction level
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
amano
xmer
g
e
.
c: minimum
r
eadabi
l
ity fix
u
p
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C Hamano
xdiff-merge: optionally
s
how c
o
nflicts i
n
"diff3 -m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
am
a
no
xdl_fill_merge_buffer(): separate
ou
t
a
too deeply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
n
io
C
Hamano
checkout --our
s
/--theirs: allow checking out one side
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
unio C
H
a
mano
c
h
e
c
kout -f: allow
i
gnori
n
g unmerged
p
aths when check
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ham
a
no
checkou
t
: do not
c
h
eck ou
t
u
nmer
g
ed higher stages randomly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Hamano
Me
r
ge b
r
anch 'jc/post-simplify' (e
a
rly p
a
rt) i
n
t
o
tr
.
.
.
commit
|
commitdiff
|
tree
2008-08-30
J
u
n
i
o C Hamano
g
it-apply: Loosen "
m
a
t
ch_beginning"
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o
C Hamano
F
i
x ex
a
m
ple in git-name-rev
d
o
cumentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Mer
g
e
branc
h
'sp/missi
n
g
-
t
h
in
-
base
'
into maint
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
M
erge branch 'sb/dae
m
o
n
'
commit
|
commitdiff
|
tree
2008-08-30
J
unio C
H
amano
Mer
g
e branch
'
a
f
/maint-ins
t
all-no-hand
l
ink' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hama
n
o
shell: do not p
l
ay duplicat
e
d defini
t
ion g
a
mes t
o
shr
i
nk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Hamano
Merge branch 'n
p
/veri
f
y-pack' into ma
i
nt
commit
|
commitdiff
|
tree
2008-08-29
Junio
C
Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-08-28
Juni
o
C Hamano
Merge
b
ranc
h
'mv/merge-c
u
stom'
commit
|
commitdiff
|
tree
2008-08-28
J
unio C
Hamano
Merge branch 'ml/submodule'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
mano
Merge
b
ranch 'am/cherry-pi
c
k-rerere'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
a
n
o
Me
r
ge branch 'jc/
a
dd-
a
ddremove'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
mano
M
e
rge branch 'np/ver
i
fy-p
a
ck'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
Merge branch
'da
/
submod
u
le-sync'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o
C
Hama
n
o
cty
p
e
.
c: protec
t
tiny C p
r
eprocessor constants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Hamano
Merge branch 'af
/
maint-in
s
tall-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
mano
Merge branch 'jc/no
-
slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-26
Ju
n
i
o
C Ham
a
no
dae
m
on
.
c: minor style fixup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Juni
o
C Hamano
Rev
e
r
t "Build-in "git-shell""
commit
|
commitdiff
|
tree
2008-08-24
J
unio
C
Haman
o
Merge branch 'jc
/
no-slim-
s
hell'
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o
C Ha
m
ano
M
e
rg
e
branch 'main
t
'
t
o
sync
w
ith 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C
H
amano
GI
T
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io
C
H
a
ma
n
o
Merge
b
ra
n
ch
'ag/maint-
c
o
mbine-diff-f
i
x' into ma
i
nt
commit
|
commitdiff
|
tree
2008-08-24
Junio C H
a
man
o
Merge branch 'm
v
/
m
aint-merge-fix' into
m
aint
commit
|
commitdiff
|
tree
2008-08-24
J
u
n
io C Hamano
t7606:
fix custo
m
merge test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
u
n
io C Hamano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
m
erge: fix
n
u
merus bugs aroun
d
"trivial merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C Haman
o
unpack_trees():
protec
t
the han
d
crafted in-co
r
e
i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
J
unio C H
a
man
o
d
i
sca
r
d_cache: reset la
z
y name_hash bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio
C
H
amano
te
m
plates/Mak
e
f
il
e
: inst
a
ll is u
n
necessary, just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C
Ham
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge branch 'ml/
s
ubmodule
-
foreach'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
Merge branch
'
pm/log-exit-code'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C
H
amano
Merge branch 'sb
/
c
o
mmit-
t
ree-mi
n
ileak'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
Merge bra
n
ch 'pb/reflog-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
M
er
g
e bran
c
h
'jc/add-stop-at-symlink'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
Merge br
a
nch 'kh
/
diff-tree'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
mano
Merge bra
n
ch 'mg/
c
ount-objects'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
i
o C Hamano
Merge branch 'mz/push-verbo
s
e'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e
b
ranch 'jc/index-extended-flags'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Ha
m
ano
Merge branc
h
'cc/merge-base
-
m
a
ny'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Merge b
r
anch 'jc/test-deep
e
r'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
M
e
rge branc
h
'js/
p
aralle
l
-
t
est'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o
C Hamano
Fix "git-m
e
rge
-
s bogo" help text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hama
n
o
Update draft
r
elease no
t
es for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Ha
m
ano
Merge bran
c
h
'
m
ain
t
'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Up
d
at
e
draft release notes fo
r
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Hamano
"
g
i
t-
m
erge":
allow f
a
st-forw
a
rdin
g
i
n a sta
t
-di
r
ty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
completion:
find out supported
m
erge strategies co
r
rectl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
for-
e
ach-
r
ef: cope
with tags w
i
th inco
m
plete
l
i
n
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hama
n
o
diff --check: do not g
e
t
confused by new blank l
i
nes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Ha
m
ano
Build-in "git-shell"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C H
a
mano
Merge b
r
anch 'bd/dif
f
-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
i
o
C Ham
a
n
o
Merge bra
n
c
h 'dp/
h
ash-literally
'
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C Hamano
Me
r
ge br
a
nch 'js/chec
k
out-
d
wim-local'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Haman
o
M
e
rge branch '
p
h
/enable-
t
hread
e
d'
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o
C Hama
n
o
M
e
r
g
e branch 'jk/pager-swap'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch 'rs/imap'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
M
erge
branch 'js/mingw-
s
tat'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
a
mano
shel
l
: do not play duplic
a
ted def
i
n
i
tion games
t
o shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Juni
o
C
H
a
man
o
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2008-08-19
Junio C Hamano
compat: introduce on
_
disk_bytes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-18
Junio C Hama
n
o
revisi
o
n -
-
simp
l
i
fy
-
m
e
rges: make it
a
no-op without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-18
Junio C
H
amano
r
evision --simpl
i
fy-m
e
r
g
es: do n
o
t le
a
ve
commits unprocessed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-18
J
u
n
io C Hamano
Makefile: Al
l
o
w
C
C_LD_
D
YNP
A
TH t
o
be overriden
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
u
nio C
H
amano
Start 1
.
6
.
1
c
ycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
uni
o
C Hamano
Start
1
.
6
.
0
.
X
ma
i
ntenance
series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Juni
o
C Hamano
G
I
T 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge g
i
t
-
gui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o C Hamano
Merge branch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
J
un
i
o C Ha
m
ano
tests:
use $TEST_DIRECTORY to
r
efer to the t/ directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C
Hamano
index: future pr
o
of for "exte
n
ded"
index en
t
r
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Jun
i
o
C Hamano
Merge git://git
.
kernel
.
or
g
/
p
ub/s
c
m/gitk/
g
itk
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
rev
i
s
i
on --simplify-me
r
g
es: use decoration i
n
stead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Ju
n
io
C Hamano
xdiff-
i
nterface:
hide the whole "xdiff_emit
_
s
tate"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
J
unio C
Ha
m
a
n
o
M
e
r
ge branch 'maint
'
commit
|
commitdiff
|
tree
2008-08-13
Juni
o
C Hamano
GIT 1
.
6
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Merge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2008-08-13
Junio
C Hamano
Do not talk about "di
f
f"
in rev-list document
a
tion
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next