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
Teach git-pull to pass -X<option> to git-merge
2010-01-18
A
very Penn
a
run
Teach git-pull t
o
pass -
X
<option> to
git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
v
ery Pennarun
git
m
erge -
X
<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
git-merge-
f
ile
--ours, --theirs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
M
e
r
ge remot
e
b
r
an
c
h 'ko/master' into HEAD
commit
|
commitdiff
|
tree
2009-11-30
A
v
ery
P
ennar
u
n
builtin-merge
.
c: cal
l
e
x
clude_
c
m
d
s() correctly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
Update draft release notes to 1
.
6
.
6 before merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Jonath
a
n Nie
d
e
r
Makefile: do not cl
e
an arm dir
e
ctory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C
H
amano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-11-27
J
o
han
n
es Sixt
Add a
notice that onl
y
certain functions can p
r
int
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C
Hamano
b
u
il
t
in-appl
y
.
c: pay
attention to -
p
<n> w
h
e
n determining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Björn Gustavsson
git
w
orkflows:
C
onsisten
t
l
y back-quote
g
it co
m
m
ands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Hamano
Merge
b
ran
c
h 'rs/work-
a
round
-
grep-
o
pt-insa
n
ity'
commit
|
commitdiff
|
tree
2009-11-25
Benja
m
in Kramer
Explicit
l
y tr
u
n
cate
bs
w
ap
o
p
era
n
d t
o
uint32_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
N
a
nako Shi
r
aishi
t1200: fix a timing depende
n
t error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
J
unio
C
Hamano
Merge branch 'rj/maint-cygwin-c
o
unt-object
s
'
commit
|
commitdiff
|
tree
2009-11-24
C
hristian Co
u
der
Documentatio
n
: update descript
i
ons
o
f
r
evision options
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Martin Sto
r
s
jö
Enab
l
e
supp
o
rt for IPv6 on MinGW
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Martin S
t
orsj
ö
Refa
c
tor winsock i
n
itializat
i
on int
o
a separate function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
M
e
rge b
r
a
n
ch '
r
s/c
o
lor-escape
-
has-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
mano
Merge br
a
nch '
b
g/apply-doc'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Hama
n
o
Mer
g
e b
r
anch
'mm/m
a
int-hint-faile
d
-merge'
commit
|
commitdiff
|
tree
2009-11-24
J
u
n
i
o C
H
amano
Merge branch
'
j
c
/
log-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
M
e
r
ge
b
ranch 'mr/
g
itwe
b
-sn
a
psh
o
t
'
commit
|
commitdiff
|
tree
2009-11-24
Brian Gernhardt
t/gi
t
web-l
i
b:
Split HTTP response w
i
th
n
on-GNU sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Me
r
ge
b
ranch 'c
c
/re
p
lace
'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
H
amano
Merge bran
c
h 'mai
n
t
'
commit
|
commitdiff
|
tree
2009-11-24
N
icolas Pitre
pac
k
-o
b
jects: split implicati
o
ns of --all-progress
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Stephen Boyd
ins
t
aweb: restart ser
v
er if already running
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Je
f
f K
i
ng
p
rune-packed: only
show
progress when
s
td
e
rr is a tty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Tay Ray Chuan
r
e
mote
-
cu
r
l
.
c: fi
x
rpc_out()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Protec
t
scripted P
o
r
c
elains from
G
REP_OPTIONS insanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René Sch
a
r
fe
mergetool--lib: sim
p
li
f
y
gu
e
ss
_
merge_t
o
ol()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René S
c
harfe
strb
u
f_add_wrapped_t
e
xt(): s
k
ip o
v
er colou
r
codes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Johannes
Sixt
t4014-f
o
rmat-patch: do not assume 't
e
st
'
i
s available
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Björn Gustavsson
Fix ove
r
-simplified docum
e
ntation
f
o
r
'
git l
o
g -z'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
Hamano
A
dd trivial tests f
o
r --stdin optio
n
to l
o
g
family
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
J
u
n
io C Ham
a
n
o
Merge
b
ranch 'bg/fetch-m
u
lti'
commit
|
commitdiff
|
tree
2009-11-23
C
h
ris
t
ian Couder
bisect:
s
implif
y
calling vi
s
ualizer using '--bise
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Martin
S
torsjö
Disabl
e
CURLOPT_NOBODY before
e
nabling CURLOPT_PUT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthew Og
i
lvie
conf
i
g d
o
cumentation: so
m
e configs are
a
uto-set by
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthew Ogilvie
c
v
sserver doc: databa
s
e generally can not be
r
eprod
u
ce
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
J
u
n
io C Ham
a
no
G
it v1
.
6
.
6
-r
c
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Mer
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o C Ham
a
no
Merge git://g
i
t
.
bogomips
.
o
r
g/git-
s
vn
commit
|
commitdiff
|
tree
2009-11-23
J
unio C Hamano
Merge bran
c
h 'th/m
a
int-
r
emote-up
d
ate-
h
elp-
s
tring
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge br
a
nch 'jn/faster-comp
l
e
t
i
on-st
a
rtup'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge
branch 'rj/ma
i
nt-t9
7
00'
commit
|
commitdiff
|
tree
2009-11-23
J
u
n
io C
Hamano
Merge b
r
anch 'ls/maint-mailinfo-
n
o-inbody
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branch
'
mo/maint-crlf-doc
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
H
a
m
a
n
o
Merge branch 'th/remote-usag
e
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
M
e
rge
br
a
nch 'pb/maint-use-cu
s
tom-pe
r
l'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branch
'
mm/config-pathname-tilde-
e
x
p
a
nd'
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
io C Hamano
Merge branch 'bc/gre
p
-i-F'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C Hamano
Merge branc
h
'jk
/
maint-break-ren
a
m
e
-reduce-mem
o
ry'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
H
amano
Merge
branch 'tc/f
o
rmat-a
t
tri
b
u
t
e'
commit
|
commitdiff
|
tree
2009-11-23
J
un
i
o
C
Haman
o
Merge branch 't
r
/m
a
int-merge-ours-clarifi
c
ation' (early
.
.
.
commit
|
commitdiff
|
tree
2009-11-23
R
e
n
é Schar
f
e
log --format:
document %w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
strbuf
_
a
dd_wrappe
d
_text(): fa
c
tor out strbuf_add_indente
d
_
text()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
g
rep:
u
nset GRE
P
_
OPTIONS before spawnin
g
e
xtern
a
l grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Björn G
u
stavsson
User Manual: Write "Git
"
ins
t
ead of "
G
IT"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Bjö
r
n G
u
sta
v
sson
F
i
x trunc
a
ted usage mess
a
ge
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
user-manual
:
Docu
m
ent tha
t
"
g
it merge
"
doesn't like
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
me
r
ge-
r
ecursive: po
i
n
t
the
u
ser to commit
w
h
e
n
f
ile
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-22
B
j
örn Gust
a
vs
s
on
apply: Use the
term "working tree" co
n
sistently
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-22
Björn
Gus
t
avsson
apply:
F
orma
t
a
ll
o
ptions using back-quotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-22
Bjö
r
n
G
ustavsso
n
a
pp
l
y:
a
pply w
o
rks
o
u
t
side a repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-22
Björn
Gusta
v
s
so
n
Cl
a
rify and correct
-
z
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
J
u
nio
C
Hamano
D
o
cumentation: avoid xmlto input error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
Haman
o
Merge br
a
nc
h
'jc/fix-tre
e
-
w
alk'
(ear
l
y part)
commit
|
commitdiff
|
tree
2009-11-21
Junio C
H
amano
Me
r
ge
branch 'jh/notes' (early par
t
)
commit
|
commitdiff
|
tree
2009-11-21
J
unio C Hamano
Merge branch 'sp
/
sm
a
r
t-ht
t
p'
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
io C Hamano
Merge branc
h
'bw/autoc
o
nf-more'
commit
|
commitdiff
|
tree
2009-11-21
J
unio C Hamano
Merge branch 'jn/
e
ditor-pager'
commit
|
commitdiff
|
tree
2009-11-21
Junio C
Hamano
Merge branch 'rj/cygwin-m
s
vc'
commit
|
commitdiff
|
tree
2009-11-21
Junio C
Hamano
Mer
g
e branch 'rj/maint-simplify-c
y
gwin-makef
i
le'
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
io
C
Hamano
Merge branch 'bg/
f
ormat
-
patch-doc-
u
pd
a
te'
commit
|
commitdiff
|
tree
2009-11-21
Junio C
H
a
m
an
o
Merge branch 'tr/fil
t
er-bra
n
c
h'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
Ham
a
no
Merge bra
n
ch 'sc/pr
o
tocol-doc'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge branch
'jl/submo
d
ule-add-
n
oname'
commit
|
commitdiff
|
tree
2009-11-21
J
unio
C
Hamano
Merge branch '
s
b/ls
-
tree-pa
r
seo
p
t
'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
Hamano
Me
r
ge
b
r
anch 'rg/doc-w
o
r
k
f
l
ow
'
commit
|
commitdiff
|
tree
2009-11-21
Juni
o
C Hamano
Me
r
ge branch
'
j
n/gitweb-log-hi
s
to
r
y'
commit
|
commitdiff
|
tree
2009-11-21
J
unio C Hamano
Merge branc
h
'jn/help-everywhere'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hama
n
o
M
erge
b
ranch 'j
p
/fe
t
ch-cull
-
ma
n
y-ref
s
'
commit
|
commitdiff
|
tree
2009-11-21
Raman Gupta
A
d
d bran
c
h man
a
gement
for
releas
e
s to g
i
tworkflows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Luk
a
s Sa
n
dstr
ö
m
git am
/
mai
l
i
nfo: Don't look at in-body headers when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Ti
m
He
n
igan
git remote: Separate us
a
g
e
st
r
i
ngs for
s
ubcommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
Hamano
d
iffcore-rename: red
u
ce memory footpr
i
n
t by
freeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
C
hrist
i
an Couder
Documentatio
n
: talk a
little bit ab
o
ut GIT_NO_REPLACE_OBJEC
T
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Chris
t
ian Couder
Docume
n
tation: fix typos a
n
d
s
p
e
lling in replace docu
m
entation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Christian Cou
d
er
replace:
use
a GIT_NO_REPLACE_OBJECT
S
env
v
ari
a
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Thomas
Rast
describe: do not use unanno
t
ated ta
g
e
v
e
n
i
f
exa
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
D
avid Aguilar
submo
d
ule
.
c: Squelch a "
u
se before assignment
"
warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Junio
C Hamano
Make
--stdin op
t
ion to "log" fam
i
ly r
e
ad also pathspec
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Junio C Hamano
setup_revisions():
d
o n
o
t
c
a
ll
g
et
_
pathspec()
t
oo early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Junio C Hamano
Teach --stdin opti
o
n
t
o
"log
"
family
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
J
u
n
io C Hamano
r
ead_
r
evisio
n
_
f
rom_stdin(): use strbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jones
g
i
t-coun
t
-objects: Fix a disk
-
space
unde
r
-estimat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Greg Pri
c
e
Docume
n
t
a
tion: un
d
ocumen
t
gc'd
function graph_re
l
ease()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
R
amsay Jones
t9700-per
l
-
g
i
t
.
sh: Fix
a test failure on Cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next