repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
filter-branch: Add tests for submodules in tree-filter
2010-01-20
Junio C Hamano
Merge br
a
nch 'tr/m
a
int-
1
.
6
.
5-bash
-
p
rompt-
s
how-sub
m
odule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'dp/mai
n
t-1
.
6
.
5-fast-impor
t
-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
ge branch 'jm/mai
n
t
-
1
.
6
.
5
-
grep-N
U
L-terminate'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
T
e
ach @{ups
t
ream} syn
t
ax to strbu
f
_
branchanme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
t1
5
06: more test for
@
{upstream} syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Fix
"chec
k
o
u
t A
.
.
.
"
synonym for "che
c
kout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
statu
s
: do
n
't re
q
uire the reposit
o
ry to
b
e writ
a
bl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Mer
g
e
branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Makefile: h
o
nor
N
O_CURL when se
t
ting R
E
MOTE_CURL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan Ca
s
ebol
t
i
dent
.
c: replace f
p
rintf with fputs to suppress compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thá
i
Ngọc Duy
r
m: onl
y
refr
e
sh
e
ntries that we may t
o
u
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Da
v
id Ripton
bisect: fix singular
/
p
l
ural gr
a
mmar ni
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimpor
t
: st
a
ndarize system() cal
l
s to
e
xter
n
al git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Wa
l
ton
cvsimp
o
rt: sta
n
darize open() calls
t
o externa
l
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
B
e
n Walton
cvsi
m
port: mode
r
nize
c
a
l
l
o
uts t
o
gi
t
subcomma
n
ds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge
b
ranch
'
maint-1
.
6
.
4' into
maint
-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hama
n
o
Merge b
r
anch 'ma
i
n
t-1
.
6
.
3' into
maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Ham
a
no
Merge bra
n
ch
'
maint-1
.
6
.
2' into ma
i
nt
-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o C Ham
a
no
Merge
c
ommit
'
v1
.
6
.
4
.
4-8
-
g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Fix m
i
s
-
back
p
o
rt
o
f
t7
0
0
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
U
pd
a
te draf
t
r
e
le
a
s
e
notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-19
J
u
ni
o
C
H
ama
n
o
Upda
t
e draft rel
e
ase
notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e branch 'dp/m
a
int-
1
.
6
.
5-fast-impo
r
t-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
am
a
no
M
erge branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Haman
o
M
er
g
e br
a
nch 'pc/
u
ninteresting-su
b
m
o
du
l
e
-di
s
a
p
p
ear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Haman
o
Mer
g
e branch 'nd/include
-
te
r
mios-fo
r
-
o
sol'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C
H
ama
n
o
Me
r
g
e
branc
h
'
j
s
/w
i
ndows'
commit
|
commitdiff
|
tree
2010-01-19
Matthie
u
Moy
branc
h
: w
a
rn and ref
u
se to set a branch
as a tracking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jens Lehmann
Perfor
m
ance o
p
timization for det
e
ction of m
o
difi
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ilari Liusva
a
ra
Ad
d
branch --set-upst
r
eam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Andr
e
a
s
Gruenb
a
cher
bui
l
tin-a
p
ply
.
c: fix
t
he ---
a
n
d +++ header filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ilari Liu
s
vaara
Add git r
e
mote set-url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Daniel
B
arkal
o
w
Rep
l
ace parse_blob() with
a
n
expl
a
natory comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o C H
a
mano
Merge
b
ranch
'
jm/main
t
-1
.
6
.
5
-grep-NUL-terminate'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim
M
e
yering
grep: N
U
L terminate inpu
t
fr
o
m a fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
An
d
rea
s
Gru
e
nbache
r
buil
t
in-apply
.
c: S
k
ip filena
m
es without enoug
h
components
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C
Hamano
sym
l
inks
.
c:
r
emove unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
m
ano
object
.
c:
r
e
move
unuse
d
fu
n
ctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
Hamano
Document that merg
e
strat
e
gies can
now
take
t
heir own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery
P
enn
a
run
Extend mer
g
e
-
subtree tests
t
o tes
t
-
Xsu
b
t
ree=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Ha
m
ano
M
ake "subtree"
pa
r
t more or
t
hogonal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
pu
l
l
:
Fix p
a
rsing of -X
<
opti
o
n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery
P
ennarun
Teach g
i
t-pull to pass -X<optio
n
>
to git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
v
ery Pennarun
g
it merge -X<o
p
tio
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
ni
o
C Haman
o
Up
d
ate d
r
a
ft re
l
ea
s
e notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
i
o C Hamano
Merg
e
branch 'tc/test-locate-http
d
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch
'
jh/commit-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Ham
a
no
Merge
b
ran
c
h 'jn/makefi
l
e'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
ma
n
o
Merge
bra
n
ch
'jc/mai
n
t-1
.
6
.
1-c
h
eckout-m-
c
ustom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
H
a
m
a
no
Merge
b
ranch
'
t
c
/clone-v-pro
g
ress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merg
e
branch 'tc/smart-ht
t
p-
r
estrict
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge branch 'jk/run-command-
u
s
e-sh
e
ll'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e
branch 's
r
/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Je
n
s Lehmann
g
i
t
s
t
a
tus:
S
h
ow uncommitted
s
ubmodule changes to
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
no
Update COPYING wi
t
h GPLv2 with new
FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
user_iden
t
_sufficientl
y
_given(): refac
t
or th
e
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
an
o
user_
i
dent_sufficiently_given(): refa
c
t
or the log
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: honor conflict-mark
e
r-size a
t
tribut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Hamano
r
e
r
ere
:
prepare for customizable
c
onflict marker
leng
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
commit
.
c:
:
print_summ
a
ry: do not
r
e
l
e
ase the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
conflict-marker-size: new attr
i
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
r
e
rere: use ll_merge() inste
a
d
of using xdl_mer
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
Hamano
merge-tre
e
:
u
s
e
l
l_m
e
rg
e
() not
x
dl_me
r
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C H
a
mano
xdl_merge()
:
allow passing down
marker_size in xmp
a
r
a
m_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
x
dl_merge(): introduce xm
p
ara
m
_t for me
r
g
e specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
Hamano
git_at
t
r(): fix function signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johanne
s
Sixt
D
o
not
use date
.
c:t
m
_
t
o
_time_t
(
) from comp
a
t
/
mingw
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Andrzej K
.
H
a
cze
w
ski
MSVC: Window
s
-native implement
a
tion for subset
o
f
Pt
h
reads API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Mer
g
e branch 'cc/r
e
s
e
t-more'
commit
|
commitdiff
|
tree
2010-01-17
R
am
k
umar Ramachandra
Documentation: Update
git
c
or
e
t
utor
i
al clar
i
f
y
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ramsay Jones
MS
V
C: Fix an "incompat
i
ble pointer
types" compil
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
Windows: avoid the "dup dance" wh
e
n spawning a child
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Joh
a
nne
s
Sixt
Windows: simplif
y
th
e
pipe(2) imple
m
entati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
Windows: boost startup by avoi
d
ing
a
static depen
d
ency
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Erik F
a
ye-Lund
W
i
ndow
s
:
disable Python
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Teach diff tha
t
mo
d
ified subm
o
dul
e
d
i
r
e
ctory is dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jens Leh
m
an
n
S
h
o
w su
b
m
odules as
modif
i
ed w
h
en they contai
n
a dir
t
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ilari Lius
v
aara
Add push --s
e
t-upstream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Christ
i
an Coude
r
t7111: fix bad
HEAD in t
e
sts with unmerge
d
en
t
ries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguil
a
r
difftool:
U
pdat
e
c
o
pyrig
h
t notices to list
each year
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Richard Wein
b
erger
Fix uninitia
l
ized
v
ari
a
ble in
get
_
refs_via_rs
y
nc()
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Tarmiga
n
Cas
e
bolt
Test
t
5560: Fix test when
r
un
w
i
t
h dash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Nguyễn Thái Ngọc Duy
status: only
to
u
ch
p
at
h
we may need to c
h
e
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id A
g
uilar
difftool:
U
s
e
eval
t
o expan
d
'--extcmd' expressions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
i
d Aguila
r
difft
o
ol: Add '-x' an
d
as an alia
s
for '--extcmd'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguila
r
t7800-di
f
ft
o
ol
.
s
h:
Sim
p
lif
y
th
e
-
-
extcmd test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C H
a
ma
n
o
grep --no-
i
nde
x
: allow u
s
e of "git gr
e
p
"
outside
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep: prep
a
re
to run
o
ut
s
i
d
e of a
w
ork tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
R
amkum
a
r Ramachand
r
a
Doc
u
ment git
-
b
l
ame triple -C option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
D
m
itry Potapov
fast
-
import: tag ma
y
poin
t
to any ob
j
ec
t
type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
co
m
mit: all
o
w s
u
ppression of imp
l
i
cit identity advic
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
comm
i
t: show interestin
g
i
dent information in summary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff Kin
g
strbuf: add strbuf_a
d
dbuf_percentquote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff
K
ing
strbuf_
e
xpa
n
d:
convert "%%
"
to "%"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
i
chael H
a
ggerty
rebase -i: Ret
a
in user-edi
t
ed commit messages afte
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
t3404:
Set up more of th
e
te
s
t repo in th
e
"setup"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mich
a
el Haggerty
reb
a
se -
i
: For fixup commands wi
t
hout squashes, d
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mi
c
hael Hagg
e
rty
r
eba
s
e -i: Change fun
c
tion make_sq
u
ash_messag
e
in
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next