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
Add additional testcases for D/F conflicts
2010-07-09
Elijah Newren
Add a
d
ditional testcases f
o
r
D
/
F
co
n
flicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-24
Junio C Ham
a
no
G
i
t 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-24
J
u
n
i
o
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-23
Eri
c
Raymond
Documentat
i
on improve
m
e
nts for the descript
i
on
of short
.
.
.
the bug noted by
Junio C Hamano
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
Jun
i
o
C Ha
m
ano
Sync with 1
.
7
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
J
unio C Ham
a
no
Git
1
.
7
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
Junio C
Hamano
Merge branch 'mg
/
use
-
d
efault-abb
r
ev
-
length-in-rev-list
.
.
.
commit
|
commitdiff
|
tree
2010-04-23
J
u
nio C
Ham
a
no
M
e
rge branch 'wp/doc
-
filter-direction' i
n
to maint
commit
|
commitdiff
|
tree
2010-04-23
J
u
nio C Hamano
Mer
g
e b
r
anch 'jk/ma
i
nt-diff
s
tat-overflow' into maint
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
Me
r
ge b
r
anch 'da/maint-python
-
startup' into maint
commit
|
commitdiff
|
tree
2010-04-22
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-04-22
J
o
n
a
than
Nieder
Documentation/Makefi
l
e: fix interrupted builds
of
u
ser
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-20
Junio C Hama
n
o
M
e
rge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2010-04-20
Mi
c
hael J Gruber
t7012: Mark missi
n
g tests as TODO
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-20
SZE
D
ER Gáb
o
r
refl
o
g: remo
v
e '
s
how' from 'expire's us
a
ge string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
Jun
i
o C
H
ama
n
o
Merge branc
h
'maint
-
1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-04-19
Johannes Sixt
MSVC
:
F
i
x b
u
ild by adding missing termios
.
h du
m
my
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
Jun
i
o C
H
am
a
no
Git
1
.
7
.
1
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
J
un
i
o
C Hamano
Merge branc
h
'rr/remote-helper-doc'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge bra
n
c
h 'wp/doc-filter-direction'
commit
|
commitdiff
|
tree
2010-04-19
J
u
nio C Ha
m
ano
Mer
g
e b
r
anch '
j
k
/maint-diffstat-over
f
l
o
w'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge
branch 'jg/auto-initialize-notes-
w
ith-p
e
rcent
.
.
.
commit
|
commitdiff
|
tree
2010-04-19
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-19
Juni
o
C Ha
m
an
o
Mer
g
e git://git
.
kernel
.
org/p
u
b/scm/gitk/gitk
commit
|
commitdiff
|
tree
2010-04-18
Ramkuma
r
R
a
machandra
Documentat
i
on/r
e
mot
e
-helpers: Fix typos and improve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar
R
amach
a
ndra
Fixup:
Se
c
ond argument may b
e
any arbitr
a
ry st
r
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramku
m
ar Ramachandra
Doc
u
ment
a
t
ion/remote-
h
elpers
:
A
dd
invocat
i
on sect
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ra
m
kumar Ramachandra
Doc
u
m
e
ntation/u
r
ls:
Rew
r
ite
to
ac
c
o
mod
a
te <transport
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Rama
c
handra
Documentation/rem
o
t
e
-helpers: R
e
write descri
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Charles Ba
i
ley
Do
c
umentation: D
e
scribe oth
e
r
situations where -z aff
e
cts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Jeff King
rebase-i
n
tera
c
t
ive
:
silenc
e
war
n
i
n
g when no commits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Junio C
Hamano
t3301: a
d
d tests to use --
f
ormat
=
"%
N
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
J
u
nio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-17
Matthew Ogilv
i
e
t600
6
:
d
o
n
ot w
r
ite
to /tmp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Ch
r
is
W
ebb
git-inst
a
web: pas
s
t
h
r
oug
h
invoking
u
s
er's path to
.
.
.
commit
|
commitdiff
|
tree
2010-04-17
Junio C Hamano
gitw
e
b: simplify g
i
tweb
.
min
.
* generation
and
c
lean
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
J
o
n
athan Ni
e
d
er
tag -
v
: use RUN_GIT_CMD to r
u
n verify
-
tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Will Palmer
doc
u
ment
a
tion: cl
a
rify direction of core
.
aut
o
crlf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Jef
f
King
diff:
u
se large integers for
diff
s
tat
c
a
l
culations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Micha
e
l J Gruber
t1010
-
m
ktree: Ad
j
ust expected resul
t
to c
o
de and do
c
umentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Thomas Rast
combined diff: correctly
handle trun
c
ated
f
ile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Doc
u
ment
n
e
w
"already
-
m
e
r
ged" rule f
o
r
br
a
nch -d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-15
Jona
t
han
N
ieder
Add
.
depend
d
irectories t
o
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-14
J
unio
C
Hamano
M
erge bra
n
ch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2010-04-14
Joh
a
nnes Gilger
pretty: Initialize
no
t
es if %N is u
s
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-13
Jay So
f
f
i
an
Document
a
tion/con
f
ig
.
tx
t
: default g
c
.
a
ggr
e
ssiveWind
o
w
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-12
M
a
rc Bra
n
chaud
Docs: Add -X option to g
i
t-m
e
r
g
e'
s
synop
s
i
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Junio C Ha
m
ano
M
e
rge b
r
anch 'jl/mai
n
t-
s
ubmodu
l
e-git
f
ile-awareness'
commit
|
commitdiff
|
tree
2010-04-11
J
o
hannes
S
ixt
Windows:
s
t
a
rt_command:
Supp
o
r
t
non-NULL
dir in struct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Juni
o
C Hama
n
o
S
ync with 1
.
7
.
0
.
5
commit
|
commitdiff
|
tree
2010-04-11
Junio C H
a
mano
Merge bran
c
h 'jc/d
o
c-s
u
bmit-gm
a
il'
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
io C Hama
n
o
Git
1
.
7
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Junio C H
a
mano
Merge
bra
n
c
h
'rc/
m
aint-reflog-ms
g
-for-forced-branch
.
.
.
commit
|
commitdiff
|
tree
2010-04-11
J
u
nio C Ham
a
no
blame documentati
o
n:
-
M/-C noti
c
e copied lines as well
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Steph
e
n Boyd
t3507
:
Make
te
s
t ex
e
cutab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Haman
o
Git 1
.
7
.
1-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
Hamano
Merge branch 'm
r
/gitweb-jsmin
'
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
H
a
mano
Me
r
ge br
a
n
ch 'jl/maint-submodu
l
e-g
i
tfile-awareness'
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehmann
Teach
diff
--submodule
and
status
t
o handle
.
git
files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio
C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-10
J
e
n
s Lehmann
L
e
t
che
c
k_pre
i
m
a
ge() use m
e
mset() to
i
ni
t
ialize "struct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge branch 'ef/maint-empty-com
m
it-log'
i
nto maint
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge branch 'jc/conflict-m
a
rker-size'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2010-04-10
Junio
C H
a
mano
Merge branc
h
'sp/maint-http
-
backend
-
di
e
-t
r
iggers-d
i
e
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
J
u
n
i
o C Ha
m
ano
Merg
e
b
ranch 'mg/maint-send-email
-
lazy-editor'
into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Mer
g
e branch 'rr/imap-send-uncon
f
use-from-line' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
io
C
Hamano
Merge b
r
a
nch 'rb/maint-python-
p
ath' in
t
o maint
commit
|
commitdiff
|
tree
2010-04-10
J
u
nio C H
a
m
ano
Mer
g
e
branch 'gh/maint-stash-show
-
error-message'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
J
unio C Hamano
Merge branc
h
'mg/mailmap-update' into maint
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
Hamano
M
e
rge branch 'b
c
/maint-dae
m
o
n
-sans-ss-family' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Ta
y
Ray Chuan
fe
t
ch/push: fix u
s
age strings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C
H
amano
Merge branch 'rc/maint-refl
o
g-msg-fo
r
-
f
o
r
c
ed-bra
n
ch'
commit
|
commitdiff
|
tree
2010-04-10
Tay
Ray C
h
uan
branc
h
:
say
"
R
e
set to" in reflog entr
i
es for 'git branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-09
Junio C Hamano
Merge early parts of jk/cached
-
t
extconv
commit
|
commitdiff
|
tree
2010-04-09
Junio C Hamano
di
f
f
.
c: wor
k
around pointer constness warnin
g
s
commit
|
commitdiff
|
tree
2010-04-09
J
unio C Hamano
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-04-08
Je
f
f King
docs:
c
larify "b
r
anch -l"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
Junio C
H
am
a
n
o
S
u
bmi
t
ting
P
a
t
ches: update G
M
ail section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
Junio C H
a
mano
Merge branch 'mg/notes-
r
ef
l
og'
commit
|
commitdiff
|
tree
2010-04-07
J
u
nio C Ham
a
n
o
M
e
rge br
a
nch 'jn/mailinf
o
-sc
i
ssors'
commit
|
commitdiff
|
tree
2010-04-07
Jeff
K
ing
fix typos and gram
m
a
r
in 1
.
7
.
1 draft release
n
o
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
B
r
andon Casey
notes
.
h: declare bit
fi
e
ld
as
u
nsigned to
s
ilence comp
i
ler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-06
Junio C Ham
a
no
Git 1
.
7
.
1-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hama
n
o
Merg
e
branch 'da/ma
i
n
t-
p
ython-startup'
commit
|
commitdiff
|
tree
2010-04-06
J
u
nio C Ham
a
no
Merge branch 'i
c
/bash-compl
e
tion-rpm'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merge
b
ranc
h
'sb/fmt-me
r
ge
-
m
s
g'
commit
|
commitdiff
|
tree
2010-04-06
J
unio C Hamano
M
e
r
g
e branch 'jc/conflict-m
a
rker-size'
commit
|
commitdiff
|
tree
2010-04-06
Junio C
H
amano
Merge branch 'e
f
/
m
aint-emp
t
y-comm
i
t
-l
o
g'
commit
|
commitdiff
|
tree
2010-04-06
J
unio C Hamano
Merge bra
n
ch 'sg/bash-completion'
commit
|
commitdiff
|
tree
2010-04-05
Junio C Hama
n
o
Rever
t
"Lin
k
agai
n
st libiconv on IRI
X
"
commit
|
commitdiff
|
tree
2010-04-04
Junio C Hama
n
o
Merg
e
bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2010-04-04
Ta
y
Ray
C
huan
pack-protocol
.
txt:
fix
p
kt-line
l
eng
t
hs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
Tay
R
ay Chuan
pack-pro
t
ocol
.
txt: fix spellin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan N
i
ede
r
Teach
m
ailinfo %< a
s
an alternati
v
e scissors mark
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o
C H
a
m
a
n
o
Me
r
g
e br
a
n
ch 'mb/reba
s
e-i-n
o
-ff'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge br
a
nch 'sp/main
t
-h
t
tp-back
e
nd-die
-
tri
g
gers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
J
u
n
i
o C
H
a
m
an
o
Mer
g
e
branch 'rr/ima
p
-send-unconfuse-from-l
i
n
e
'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C Hamano
Merge b
r
anch 'mg/use-default-abbrev-length-
i
n-rev-list'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C
Ham
a
no
Merge branch 'mg/mai
n
t
-
sen
d
-email
-
l
a
zy-edi
t
or'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
amano
Merg
e
branch 'r
b
/maint-python-path'
commit
|
commitdiff
|
tree
next