repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git notes merge: Manual conflict resolution, part 1/2
2010-07-14
Wi
l
l
P
al
m
er
m
e
rge-tree
:
f
ix
where two
branches sha
r
e
no changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will
P
almer
add
basic
t
e
s
t
s for m
e
rge-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Git 1
.
7
.
2-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Merge br
a
nc
h
'jc/read-
t
ree-cache-tr
e
e-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R H
a
rinath
Use dev_t
f
or devi
c
e id (st_dev
)
f
rom stat in
se
t
up_git_dire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
J
unio C Hamano
dif
f
A
.
.
.
B: g
i
v
e
one
p
ossi
b
le diff wh
e
n there are
m
o
re
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Juni
o
C Ham
a
n
o
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
O
ren
H
e
ld
git fetch
d
o
cumentatio
n
:
d
e
scribe sho
r
t '-p
'
synonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Vajna
fo
r
m
at-
p
a
t
ch: doc
u
ment th
e
format
.
to configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehmann
git add: Add t
h
e "--ignore-m
i
ssing" option for the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
M
ich
a
el
J
G
ruber
test-li
b
: TAP
compliance
for skipp
i
ng tests o
n
request
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
test-lib: simplify GIT_SKIP_T
E
STS
loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jun
i
o C Hamano
Me
r
ge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonat
h
an Nie
d
er
t
3
000
(
ls-files -o): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fredri
k
Skolmli
Documentation:
Sp
e
lling fix in pro
t
oco
l
-capa
b
ilities
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
N
icolas Sebre
c
ht
m
erge-
r
e
cu
r
si
v
e: use "up-to-date" ins
t
ead of "uptoda
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
N
i
col
a
s Sebrech
t
che
c
kout: acc
o
rd docume
n
tation to what git does
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Joha
n
nes
Si
x
t
t0005:
w
ork ar
o
und st
r
ange $? in k
s
h when
p
rogram terminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C
H
amano
M
er
g
e remo
t
e branch 'ko/ma
s
ter' i
n
to jc/read-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
B
o
Yang
diff
.
c
: f
i
x a
g
rap
h
outpu
t
bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Æva
r
Arnfjörð
B
jarmason
tests: Use
skip_al
l
=* to skip tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
u
ni
o
C Hamano
Fix
"read-tr
e
e -m
A B" priming the cache-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli
Barzilay
Reor
g
anize `git-log' man
p
a
ge to cl
a
r
i
f
y co
m
mon diff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
grep -O: Do not p
a
ss co
l
or s
e
quences
as filenames
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
Git 1
.
7
.
2-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hama
n
o
Merge b
r
anch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hama
n
o
backmerge a few mor
e
fix
e
s to 1
.
7
.
1
.
X serie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ha
m
ano
Merge b
r
anc
h
'maint-1
.
6
.
4' into mai
n
t
commit
|
commitdiff
|
tree
2010-07-07
Uwe K
l
ei
n
e-König
rev-par
s
e
:
fi
x
--parse-
o
pt --ke
e
p-dashdas
h
--stop-a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
M
erge branch
'mg
/
doc-rev-parse-treepath-syntax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C H
a
mano
Merge branch 'tr/
r
eceive-pack-
a
liase
d
-up
d
ate-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
P
ier
r
e
H
ab
o
uzit
fix git branch
-m in presence of
c
ross devices
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Casey
t/t0006:
s
pecify timezone as
E
ST
5
not E
S
T
to comply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
do not write
o
ut
i
n
d
ex w
h
en status d
o
es n
o
t hav
e
to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Haman
o
Merge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2010-07-07
He
i
ko Voigt
add missing &
&
to submodule-m
e
r
ge testcase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
o
n
at
h
an Nieder
t/RE
A
DME: document more test
h
elpers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon C
a
sey
Makefile: wor
k
a
ro
u
nd ks
h
's fai
l
ur
e
t
o han
d
l
e missing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
test-date: fix sscanf type c
o
n
v
ersion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
J
u
n
io C Hamano
Merge bra
n
ch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2010-07-06
D
y
l
an
R
eid
xdiff: optim
i
s
e
for no whitespace
d
ifference wh
e
n ign
o
ring
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Junio
C
Hamano
rebase-i: do not
g
e
t f
o
oled by a lo
g
message ending
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
J
unio C Hamano
rebas
e
-i: style fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Mi
c
hael J Gruber
Documentation: link to
g
itrevisions rather than git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Michael J Gruber
Document
a
tion: gitrevisions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Mich
a
el J Gr
u
ber
Documentation: split off
r
ev doc into
i
nclude
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Jakub Narebski
g
itweb: Mo
v
e evaluate_gitweb_con
f
ig out
of run_reque
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
pa
r
se_dat
e
: fix signed
n
ess in timezone calcul
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Junio C Hamano
Merge b
r
an
c
h 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
t0006: tes
t
timezone parsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Ævar
A
rnfjörð Bjar
m
ason
g
i
t
subm
o
dule:
a
d
d
submodules
w
ith gi
t
add -
f
<path>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
M
i
chael J Gruber
rer
e
re
.
txt: Document
f
orget sub
c
omma
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Junio C Ham
a
no
t
/R
E
ADME: prop
o
sed rewordi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Ævar Arnfjörð Bjarmason
t/README: D
o
cument the do's and don'ts of test
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Æ
var A
r
n
f
jörð
B
jarma
s
o
n
t/R
E
ADME:
A
dd a secti
o
n ab
o
ut
sk
i
ppi
n
g tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Ævar Arnfjörð B
j
armas
o
n
t/README: Doc
u
ment tes
t
_
e
xpect_code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Æ
var
Arnfj
ö
r
ð
Bjarm
a
son
t/R
E
A
DME: Document
test_
e
xternal*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Æ
v
ar Ar
n
fjörð B
j
armason
t
/
R
EADME: Docum
e
nt t
h
e pre
r
eq fu
n
ctions, and 3-a
r
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Ævar Arn
f
jörð Bjarmaso
n
t
/RE
A
DME: Typo: paralell -> parallel
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Ævar
A
rnfjörð Bjarmason
t/README
:
The trash
i
s in 't/trash dire
c
tor
y
.
$name'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
B
randon
Casey
Makefile: remove some unnecessary curly
braces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Chris Packham
Documentatio
n
/
g
it-
g
c
.
tx
t
: add referen
c
e to g
i
thooks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-02
Junio C Hama
n
o
Upda
t
es
f
rom the list to 1
.
7
.
2 Release Notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-30
J
u
nio C Hamano
Git 1
.
7
.
2
-
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-30
Junio C Hamano
git
.
spec
.
i
n:
A
dd gitw
e
b subpackage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-30
Junio C Ham
a
no
Mer
g
e
b
ranch
'
ar/deco
r
at
e
-
c
o
lor'
commit
|
commitdiff
|
tree
2010-06-30
J
unio C Hamano
Merge bran
c
h 'mg/do
c
-rev-parse-treepath-syntax'
commit
|
commitdiff
|
tree
2010-06-30
Junio
C
H
ama
n
o
Merge
bra
n
ch 'cc
/
cher
r
y-pick
-
stdin'
commit
|
commitdiff
|
tree
2010-06-30
Jun
i
o C Ham
a
no
Merge branch '
j
l/statu
s
-ignore-su
b
modules'
commit
|
commitdiff
|
tree
2010-06-30
J
u
nio C Ha
m
an
o
M
e
rg
e
branch 'jk/ur
l
-decode'
commit
|
commitdiff
|
tree
2010-06-30
Junio
C Hamano
Merge
b
ra
n
ch 'jn
/
g
r
ep-ope
n
'
commit
|
commitdiff
|
tree
2010-06-30
Ju
n
io C Haman
o
Merge branch 'jp/s
t
ring-li
s
t
-api-cleanup'
commit
|
commitdiff
|
tree
2010-06-30
Junio
C
H
amano
Merge bra
n
ch
'
tr/rev-list
-
count
'
commit
|
commitdiff
|
tree
2010-06-30
Junio C H
a
ma
n
o
M
e
rge bra
n
ch 'a
s
/maint-completion-s
e
t-u-fix'
commit
|
commitdiff
|
tree
2010-06-30
Ju
n
io C Hamano
M
erge bran
c
h 'mg/rev-parse-tests'
commit
|
commitdiff
|
tree
2010-06-30
J
u
ni
o
C Hamano
Merge branch 'j
l
/maint-diff-ignor
e
-su
b
modules'
commit
|
commitdiff
|
tree
2010-06-30
Nazri
R
a
m
liy
Add test
f
or correct color
i
ng of git log
-
-d
e
cor
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-29
Junio
C
Hamano
S
ync with 1
.
7
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nieder
r
e
vert: do not rebuild a
r
g
v on
h
e
a
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-29
Ju
n
io C Ham
a
no
Merge com
m
it 'v1
.
7
.
2-rc0
~
6^2'
i
nto cc/
c
herry-pick-std
i
n
commit
|
commitdiff
|
tree
2010-06-29
J
unio C Ham
a
n
o
Gi
t
1
.
7
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-29
Brandon Casey
t
/
t
9700
/
tes
t
.
p
l
: don't ac
c
ess
p
r
i
v
ate object memb
e
rs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-29
Brandon Casey
t
/t9001: use egrep when
r
e
gular expressions are involved
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-29
Michael J Gruber
git-rev-parse
.
txt: Add m
o
re exam
p
le
s
for ca
r
e
t an
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-29
Junio C Ham
a
no
M
erg
e
branch
'maint'
commit
|
commitdiff
|
tree
2010-06-29
Junio C
H
amano
Update draft release notes
to 1
.
7
.
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-28
Junio C
Hamano
Merge branch
'
tr/send-em
a
il-8bit' i
n
t
o maint
commit
|
commitdiff
|
tree
2010-06-28
Junio C Hamano
Merge bra
n
ch 'pb/maint-perl-errmsg-no-dir' i
n
to m
a
int
commit
|
commitdiff
|
tree
2010-06-28
Junio C Ham
a
no
Mer
g
e branch 'js/m
a
int-am-r
e
base-i
n
valid-autho
r
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-06-28
Junio C Hamano
Merge branch 'jc/main
t
-simpl
e
r
-
common-pr
e
f
i
x
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-06-28
Junio C
H
amano
Merge branch 'b
d
/mai
n
t-un
p
a
c
k-trees-parawalk-fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-06-28
Nguyễ
n
T
h
ái
N
gọc
Du
y
git --
p
agi
n
at
e
: do n
o
t commit pager choi
c
e to
o
e
a
rly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t
ests: l
o
c
al con
f
ig file should b
e
honored from subdirs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan N
i
eder
t7006: test p
a
ger configuration for several git commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t
7
006 (page
r
): introduce he
l
p
er
f
or parameterized
t
ests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-28
Ramsay
Jo
n
es
notes:
I
nitialise
v
aria
b
le to appe
a
se gcc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jeff Kin
g
no
t
es: ch
e
ck number of parameters
t
o
"
git no
t
es copy"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-28
R
am
s
ay Jones
m
s
vc
:
Select the "fast" definition of the {get
,
put
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-06-27
Michae
l
J
G
ruber
git-r
e
v-parse
.
t
x
t: Document
":path" specifier
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next