repo.or.cz
/
git
/
gitbuild.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/am-options'
2008-09-19
Jun
i
o C Hamano
Me
r
ge
b
ranch
'
jc
/
maint-chec
k
ou
t
-keep-remove'
in
t
o
m
a
int
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Merge branc
h
'jc/maint-diff-quiet' into maint
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Me
r
ge b
r
an
c
h 'jc/maint-name-hash
-
clea
r
'
into maint
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Merge branch
'
j
c/main
t
-tem
p
l
a
t
e-
p
e
r
mbits' into mai
n
t
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
M
e
r
g
e
branch 'mh/
m
a
i
nt-
h
onor-no-ssl-verify' into ma
i
n
t
commit
|
commitdiff
|
tree
2008-09-18
Junio
C Ham
a
no
diff/diff-fil
e
s
: do no
t
use --
c
c too agg
r
e
ssively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-16
Jun
i
o C Hamano
Merg
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-09-16
J
u
nio
C H
a
mano
Merge branch '
d
p/maint-rebase-fix'
commit
|
commitdiff
|
tree
2008-09-16
Ju
n
io C
H
aman
o
Mer
g
e b
r
anch '
j
c/m
a
int-checkout-keep-remo
v
e'
commit
|
commitdiff
|
tree
2008-09-16
J
u
nio C
H
ama
n
o
Merge branc
h
'jc/
m
aint-di
f
f-
q
uiet'
commit
|
commitdiff
|
tree
2008-09-16
J
u
nio C Hamano
Me
r
g
e branch 'jc
/
maint-name-h
a
sh-
c
lea
r
'
commit
|
commitdiff
|
tree
2008-09-16
J
u
nio C Hamano
Merge branch 'jc/ma
i
nt-templat
e
-permbits'
commit
|
commitdiff
|
tree
2008-09-16
Jun
i
o C Hamano
Mer
g
e branch
'
mh/maint-honor-n
o
-ssl
-
v
erify'
commit
|
commitdiff
|
tree
2008-09-13
Junio C Hamano
Sync with 1
.
6
.
0
.
2
commit
|
commitdiff
|
tree
2008-09-12
Junio C
Hamano
GIT
1
.
6
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-12
Ju
n
i
o C Hamano
M
e
r
ge bran
c
h 'ho/m
a
i
nt-dashle
s
s' into ma
i
n
t
commit
|
commitdiff
|
tree
2008-09-10
Ju
n
io C Hamano
Fix git-diff-tre
e
--s
t
di
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-10
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-10
J
un
i
o C Hamano
Updat
e
draft release notes for 1
.
6
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-10
Junio C Hamano
Merge
branch 'jc/maint-log-gr
e
p' into maint
commit
|
commitdiff
|
tree
2008-09-10
J
u
ni
o
C
Hamano
Merge branch 'jc/maint-hide-cr-in-diff-from-le
s
s
' int
o
.
.
.
commit
|
commitdiff
|
tree
2008-09-10
Junio
C Ham
a
no
Merge branc
h
'
jc/m
a
in
t
-
c
h
ecko
u
t-fix
'
into mai
n
t
commit
|
commitdiff
|
tree
2008-09-10
Junio C H
a
ma
n
o
Merge branch 'np
/
maint-sa
f
er-pack' into m
a
int
commit
|
commitdiff
|
tree
2008-09-10
J
u
nio C Ha
m
ano
Merge
branch 'ho/dashles
s
'
commit
|
commitdiff
|
tree
2008-09-10
Junio
C H
a
m
a
n
o
check
o
ut: d
o
not lose
s
taged removal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-09
J
u
nio C Hamano
Fix pe
r
mission bi
t
s on sources checked out with
a
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-09
Ju
n
i
o
C Hamano
push: rec
e
iver end advertises r
e
fs fro
m
alternate
r
epositories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-09
Junio
C
Ha
m
ano
push:
prepa
r
e
sender to rece
i
ve
e
xtended ref in
f
o
rmation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-09
Junio
C
Hamano
receive-pack: make it a builtin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-09
J
unio C Hama
n
o
is_
d
irect
o
ry()
:
a
generic helper f
u
nction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-08
Ju
n
i
o C Haman
o
Merge git://
g
it
.
bogom
i
ps
.
o
r
g
/gi
t
-svn
commit
|
commitdiff
|
tree
2008-09-08
Junio C H
a
ma
n
o
Merge branch 'a
r
/autospell'
commit
|
commitdiff
|
tree
2008-09-08
Junio C Hamano
Merge branch 'jc/cc-
l
d-dynpath'
commit
|
commitdiff
|
tree
2008-09-08
Junio
C
Haman
o
Merge branc
h
'jc/hide-cr-i
n
-diff-from-less'
commit
|
commitdiff
|
tree
2008-09-08
Jun
i
o
C
Hamano
M
e
rge
br
a
nch
'jc/m
a
int
-
checko
u
t-f
i
x'
commit
|
commitdiff
|
tree
2008-09-07
J
unio C Hamano
Don't
v
e
r
i
f
y host name in SS
L
certs when GIT_SSL_NO_V
E
R
I
FY
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-07
Junio C Haman
o
dae
m
on
.
c: avoi
d
se
t
line
b
uf()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-07
Junio C Hamano
Update draft releas
e
notes for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-07
Jun
i
o C H
a
mano
Merge git://gi
t
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2008-09-07
Junio C Hama
n
o
diff -
-
quiet: mak
e
it synon
y
m to --exit-code >/de
v
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-07
Junio C
H
amano
diff
Porcelain: do not disable auto in
d
ex
ref
r
esh
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-07
Ju
n
io C
H
ama
n
o
git-apply:--include=p
a
ths
p
ec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-07
Juni
o
C
Hamano
Merge
u
pdated
g
it
-
gui an
d
g
itk that
c
all
e
ac
h
o
ther
commit
|
commitdiff
|
tree
2008-09-06
Juni
o
C Hamano
Merge
branc
h
'mai
n
t
'
commit
|
commitdiff
|
tree
2008-09-06
J
unio C Ha
m
a
no
Update dra
f
t rel
e
as
e
notes for 1
.
6
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-06
Jun
i
o C Hamano
stash:
refresh
t
h
e ind
e
x
before deci
d
ing
if the wor
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-06
Junio
C Hamano
Merge branch 'main
t
' of git
:
//repo
.
or
.
cz
/
git-gui i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
Junio C Hamano
M
en
t
ion
th
e
fac
t
that 'g
i
t a
n
notate' is only for backward
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-05
Jun
i
o C
H
am
a
no
"blame -c
"
s
h
ould be compa
t
i
b
le with "annotate"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-05
J
unio
C
Hamano
Merge branc
h
'jc/m
a
int-log-gr
e
p'
commit
|
commitdiff
|
tree
2008-09-05
Ju
n
io C Hama
n
o
log --a
u
tho
r
/--committer: really
m
atch on
l
y with name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-04
Ju
n
i
o
C Hamano
diff --cumulative is a s
u
b-op
t
ion
o
f --di
r
st
a
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-04
Juni
o
C H
a
mano
sa
f
e_create
_
l
e
ading_directories(): make it abou
t
"le
a
ding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-03
J
u
nio
C Hamano
Update draft release not
e
s for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-03
J
u
nio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-09-03
J
unio C Hamano
Start
1
.
6
.
0
.
2
maintena
n
ce cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-03
Jun
i
o C Hamano
Merge branch
'nd
/
wo
r
ktree' into mai
n
t
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hama
n
o
Merge b
r
anch
'
h
o
/dashles
s
' i
n
to maint
commit
|
commitdiff
|
tree
2008-09-03
Junio C
H
amano
Merg
e
bran
c
h 'tr
/
f
ilter-bran
c
h
'
commit
|
commitdiff
|
tree
2008-09-03
Ju
n
io C H
a
mano
Merge branch '
n
p
/mai
n
t-safer-pac
k
'
commit
|
commitdiff
|
tree
2008-09-03
Jun
i
o C
H
ama
n
o
M
e
r
g
e
b
ran
c
h 'r
f
/man-env'
commit
|
commitdiff
|
tree
2008-09-03
Juni
o
C
Ha
m
ano
Me
r
ge branch 'jc/auth
o
r-nickn
a
me
'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hama
n
o
Merg
e
b
ranch '
d
p/pid
-
uintmax'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-09-03
Ju
n
i
o C Hamano
Merge bra
n
ch 'np/maint-safer-pa
c
k' into np/pack
commit
|
commitdiff
|
tree
2008-09-01
Junio C H
a
mano
git
-
merge documentation: desc
r
ibe
how conflict is
p
rese
n
ted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-01
Junio C Hamano
checkout --conflict=<style>
:
r
ecre
a
t
e
merge i
n
a non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-01
Junio C Hamano
Merge bran
c
h
'tr/rev-list
-
docs' into tr/filter
-
branch
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Ham
a
n
o
M
e
rge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ha
m
ano
git-add --
i
ntent-to-add
(
-N
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
H
amano
'git foo' program identifies
i
tself
w
it
h
out da
s
h i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Hamano
git commi
t
--author=$name: look
$
name up in existing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C H
a
m
ano
di
f
f: vary
d
e
f
ault
p
refix de
p
en
d
ing on what
a
re compared
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
diff: Help "les
s
"
h
ide ^M from the output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Hamano
M
e
rge branch '
m
a
int
'
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
H
a
mano
gitattributes:
-cr
l
f is not bina
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
checkout -m: rec
r
eate m
e
r
g
e
when checking out of unmer
g
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
Me
r
ge b
r
anch 'jc/maint-checkout-fix'
into 'jc/better
.
.
.
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ha
m
ano
git-merge-re
c
ursive: learn
t
o
honor
merge
.
confl
i
c
t
style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
m
e
r
ge
.
c
o
nfl
i
ctstyle: c
h
o
o
se between "me
r
ge" a
n
d "
d
iff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Hamano
rerere: underst
a
nd
"
diff
3
-m" st
y
le conflicts wit
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Hamano
rerer
e
.
c: use
sym
b
olic constants to keep
t
rack of par
s
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
J
u
ni
o
C
H
am
a
n
o
xmerge
.
c
: "diff3 -m" s
t
yle
c
lips
m
er
g
e reductio
n
leve
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
J
uni
o
C
Hamano
xmerg
e
.
c: minimum
r
eadability
f
ix
u
ps
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
a
mano
xdiff-merge:
o
p
t
ionally sh
o
w conflicts in "diff3 -m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
J
unio C Hamano
xdl_fill_merge
_
b
uffer(): separate
o
u
t a too de
e
p
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Ha
m
ano
checkout
--ours/--thei
r
s:
allow checking out one
side
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio
C Hamano
checkou
t
-f: allow ig
n
oring unmerged paths w
h
en che
c
king
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
i
o C Hamano
ch
e
ckout: do not check out u
n
merged hi
g
h
er stages randomly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C
Hama
n
o
M
erge branch 'jc
/
po
s
t-simplify' (
e
arly
p
a
rt)
into tr
.
.
.
commit
|
commitdiff
|
tree
2008-08-30
Junio C
Hamano
git-apply: Loosen
"
m
atch_beginning" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
an
o
F
ix exam
p
le in git-name-rev docume
n
tat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
i
o
C Hamano
Merge
bra
n
c
h 'sp/missing-thin-b
a
s
e
' into mai
n
t
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
M
e
rge br
a
n
ch 's
b
/
d
a
emon'
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Ham
a
n
o
Merge
branch 'af/maint-install-no-handlink' in
t
o
maint
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Hamano
sh
e
ll: do not play duplicated
d
ef
i
n
i
t
ion g
a
me
s
to shr
i
nk
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge bra
n
ch 'np/
v
eri
f
y-pack' int
o
maint
commit
|
commitdiff
|
tree
2008-08-29
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Ha
m
ano
Merge b
r
anch 'mv/me
r
ge-cus
t
o
m
'
commit
|
commitdiff
|
tree
2008-08-28
J
unio C
H
amano
Merge b
r
anch 'ml/s
u
b
m
odule'
commit
|
commitdiff
|
tree
next