repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge script: tweak unmerged files message to match builtin
2010-08-18
Jon
a
tha
n
Niede
r
merge script: tw
e
ak unmerge
d
fi
l
es message to mat
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merge
script: --sq
u
ash, --ff from unborn branch are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
fmt-merge-msg -m t
o
ov
e
rr
i
de merge title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
merge-base --inde
p
end
e
nt to prin
t
reduced paren
t
list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merge-
b
ase --
o
ctopus
t
o
mimic s
h
ow-branch --merg
e
-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
than N
i
eder
Documen
t
ation
:
a
d
d a
S
E
E
ALSO secti
o
n for
m
e
r
ge
-
base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
on
a
t
han Nieder
t6200 (fmt-merg
e
-msg
)
: style ni
t
p
i
cks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
t6
0
10 (me
r
ge-base): m
o
derniz
e
sty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
t7600 (merge): test merge fr
o
m bran
c
h
ye
t
to be
born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nie
d
er
t7600 (m
e
rg
e
)
: check
ref
l
og entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an
N
ieder
t7
6
00
(
merge
)
:
do not launch
gitk for --d
e
bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
t
7
600 (m
e
rge): modern
i
z
e
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e: do no
t
mistake
(an
c
estor of) tag f
o
r branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C
H
amano
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
u
nio C Hamano
tes
t
s: c
o
rrect "does r
e
flog exist
?
"
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brando
n
Casey
t/: wor
k
around o
n
e-shot variable as
s
ignment w
i
th test_must_
f
ail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
N
i
eder
t/README: correct an exception w
h
en
b
r
eaking a && chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
B
randon Casey
t/
{
t5541,lib-httpd}: r
e
place problem
a
tic
'!()'
n
otation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
B
randon Casey
t/t3700:
con
v
er
t
two u
s
es of
nega
t
ion operator '
!
'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hama
n
o
M
erge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t
/READM
E
: clarify
test_must_fail descripti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
G
reg
B
roc
k
man
Check size of path b
u
ffer before wri
t
i
n
g
into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
i
o C Hamano
Mer
g
e
bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf
Thielow
upd
a
te-se
r
ver-inf
o
: Shorten r
e
a
d_
p
ack_in
f
o_fi
l
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð B
j
armaso
n
git a
d
d: Add --ignore-missing t
o
SYN
O
PSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arn
f
j
ör
ð
Bjarmason
git su
b
modul
e
add: Remove old docs about implicit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Leh
m
ann
git submodule add:
R
eq
u
ir
e
the
new
--
f
or
c
e option
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
u
nio C Hamano
Merge branch
'
jl/add-n-ign
o
re-missing'
commit
|
commitdiff
|
tree
2010-07-19
D
avid
A
guilar
Documentat
i
o
n
: E
x
pla
i
n gi
t
-m
e
rge
t
ool's use o
f
tempo
r
ar
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Juni
o
C Hama
n
o
M
e
rge branch
'
jc/diff-merge
-
base-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas R
a
s
t
O
nly
r
un
a
g
gregate-results
over actual counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nieder
Add
a
sample
user for the
svndump library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio
C
Hamano
diff A
.
.
.
B: do not limit
the
s
ynta
x
too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bran
c
h 'jn/paginat
e
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Merge branch 'wp/me
r
ge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
an
c
h
'js/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge branch 'jc/diff-merge-base-m
u
lti'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Me
r
ge branch 'ns/merge
-
recursive-uptodat
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'j
n
/t
e
sts'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio
C Hamano
Merge
b
ranch
'
e
b
/
doc-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio
C Hama
n
o
Merge
bran
c
h
'jn/
g
rep
-
o
p
e
n'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C H
a
mano
Merge branch 'm
g
/rev
i
sion-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch '
j
k/m
a
int-status-keep-inde
x
-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jc/re
b
ase-i-
c
ommit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Ha
m
a
no
Merg
e
b
r
anch 'ab/submodule-
a
dd-f'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
M
erge branch
'
bc/maint-makefil
e
-fi
x
es'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C
H
amano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Documentation
:
add su
b
m
odule
.
*
to t
h
e big con
f
igu
r
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Ni
e
der
gitmodul
e
s
.
5
: url can b
e
a rel
a
t
i
ve
p
ath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
P
avan
K
umar Su
n
kar
a
gitweb: fi
x
e
s
c_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jon
a
than Nie
d
er
g
it --pagin
a
te: paginate
ext
e
rna
l
c
o
m
mand
s
again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERGE_
R
R
is in
.
git, not
.
git/rr-cac
h
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palm
e
r
mer
g
e-tree
:
fix
w
here two branches shar
e
no cha
n
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Pal
m
er
add ba
s
ic test
s
for me
r
g
e-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Ju
n
io
C
Ham
a
n
o
G
it
1
.
7
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio
C Hamano
Merge branch 'jc
/
read-tre
e
-
c
a
c
he-tree
-
fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Harinath
Use dev_t for d
e
vice id (st_dev) from
stat in setup
_
git_dir
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
d
iff A
.
.
.
B:
g
i
ve one
p
ossible di
f
f whe
n
t
here
a
r
e
m
ore
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C H
a
mano
M
erge
branch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-13
Or
e
n Held
git fetch docum
e
n
t
ation: desc
r
ibe
short '-p
'
synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Miklos
V
ajna
format-p
a
tch: document
t
h
e
f
ormat
.
to
c
onfigurati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
J
e
n
s L
e
hmann
git add: Add the
"--ignore-missing" option f
o
r the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mich
a
el
J Grub
e
r
test-lib: TAP compliance
f
or skippin
g
tests on re
q
uest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
M
i
c
hael J
G
ruber
test-lib: simplify GIT_S
K
IP_TESTS loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio C H
a
mano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
J
o
n
at
h
a
n
Nie
d
er
t3000
(
ls-files -o): modernize st
y
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik
S
kolmli
Documentation: S
p
e
l
l
ing fix
i
n protocol-capabilities
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas
Sebrecht
merge-recursive: use "up-
t
o-date" instead
o
f
"uptoda
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicola
s
Sebrecht
checko
u
t: accor
d
documentation t
o
what git does
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
ohannes
S
ixt
t0
0
05: work around s
t
range $? in ksh when program terminate
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C H
a
mano
M
erge re
m
o
te branch
'
ko/master' into
j
c/read-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo
Yang
diff
.
c: fix a graph out
p
u
t b
u
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjörð Bj
a
r
mas
o
n
tests:
U
se s
k
i
p
_all=
*
to s
k
ip te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
u
ni
o
C Hamano
Fix "read-tree -m
A B" priming the cache
-
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli
B
a
rz
i
lay
Reorgani
z
e
`
g
i
t-log' man page to clarify commo
n
di
f
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
gre
p
-
O
: Do not pas
s
c
o
lo
r
s
e
quences as f
i
lenames to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io
C
Hamano
G
i
t
1
.
7
.
2-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C H
a
mano
M
erge branch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
J
u
n
io
C Hamano
M
e
rg
e
b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Hamano
b
a
ckmer
g
e
a few
more fixes to 1
.
7
.
1
.
X se
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Ham
a
n
o
Merge branch 'maint-1
.
6
.
4'
i
n
to maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine-
K
ö
nig
rev-parse: fix --par
s
e-o
p
t --ke
e
p-dash
d
ash -
-
stop-at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C H
a
mano
Merge
b
ranch
'
mg/doc
-
rev-p
a
rs
e
-treepath-syntax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
J
unio
C
H
a
ma
n
o
M
e
rg
e
branch
'tr/receiv
e
-pack-aliased-updat
e
-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre H
a
bouzit
fix g
i
t branch -
m
in pr
e
sence of
c
ross devices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Bran
d
o
n
Casey
t/
t
00
0
6
:
specify tim
e
zone
a
s E
S
T5
not ES
T
to comply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
aman
o
do not write out in
d
ex when status
does not have to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Hei
k
o
V
oigt
a
d
d
m
is
s
i
ng &&
t
o
subm
o
dule-m
e
rge te
s
tcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jon
a
t
han
Nieder
t/READ
M
E: document
m
ore test helpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Cas
e
y
Ma
k
efile: work around ksh's failure to h
a
ndle missing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
t
est-date: fix sscanf
t
ype conv
e
rsion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Hamano
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-06
Dylan Re
i
d
xdiff: optimise
f
or no whitespace
d
ifference w
h
e
n
ignoring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Hamano
rebase-
i
: do
not get
f
ool
e
d by a log
me
s
sage endin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
J
u
nio C Hama
n
o
re
b
a
s
e
-
i: style fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Michael
J
G
r
ub
e
r
D
ocumentation: link to gitrevisions
r
ather than
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Michae
l
J Gruber
Documentation: gitrevisions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Micha
e
l J Gruber
D
o
cumentation: split
o
f
f
r
ev doc
into include file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Jaku
b
Narebski
g
itweb: Move
e
valuate_gitweb_
c
onfig
o
u
t
of run_
r
eques
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next