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
git merge -X<option>
2010-01-18
Avery Pennarun
git merge
-X<option
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hamano
git-merge-
f
i
l
e --ou
r
s
,
--their
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Merge
rem
o
te branch '
k
o/maste
r
' int
o
HEAD
commit
|
commitdiff
|
tree
2009-11-30
A
v
ery P
e
nnarun
builtin-merge
.
c: c
a
l
l
exclude_cmds() corre
c
tly
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Juni
o
C
Hamano
Update draft re
l
ease notes to 1
.
6
.
6
b
e
fore mer
g
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jonathan
N
iede
r
Makef
i
le: do no
t
clean a
r
m
d
ir
e
c
t
ory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Johannes
S
ixt
A
d
d
a
notice tha
t
only certain functions can print
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C
H
amano
builti
n
-
app
l
y
.
c
:
pay atte
n
tion to -p<
n
> when dete
r
min
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
B
j
örn
Gustavss
o
n
gitworkflo
w
s: Cons
i
s
tently back-
q
u
o
te
gi
t
commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
J
unio C
H
a
mano
M
e
r
g
e br
a
nch '
r
s/work-around
-
grep-opt-
i
nsani
t
y'
commit
|
commitdiff
|
tree
2009-11-25
Benjamin K
r
a
m
e
r
Expli
c
i
t
ly truncate bswap operand to uint32_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Nan
a
ko Shira
i
shi
t12
0
0: fix a timing depe
n
d
e
nt error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
mano
Merge
bran
c
h 'rj/maint-cygw
i
n-count-objects
'
commit
|
commitdiff
|
tree
2009-11-24
C
h
ristian
C
o
uder
Docu
m
entation
:
update descri
p
tions of
r
evision o
p
tions
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Martin
S
to
r
sjö
Enab
l
e sup
p
ort for IPv
6
on MinGW
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Martin
Storsjö
Refactor
winsock initialization int
o
a
se
p
arate
f
un
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch
'rs/
c
olo
r
-esc
a
p
e
-
has-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Hama
n
o
Merge branch 'bg/apply-doc'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
M
e
r
g
e
branc
h
'mm/
m
a
int-hint
-
failed-
m
erge'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
Haman
o
Merge branc
h
'
j
c/log-
s
tdin'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C H
a
ma
n
o
Mer
g
e branch
'mr/gitweb
-
snapshot'
commit
|
commitdiff
|
tree
2009-11-24
Brian Gernh
a
rdt
t
/
g
itweb-lib:
Split HTTP response w
i
th non-GN
U
sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C H
a
mano
Merge branch
'
cc
/
replace'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Hamano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-11-24
Nico
l
as Pitre
pack-objects: split
i
mp
l
icati
o
ns
o
f --all-progress
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Stephen
B
oyd
ins
t
aweb: rest
a
rt
s
erver if alread
y
running
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
prune-packed: only show progress when stder
r
is a tty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Tay Ray Ch
u
an
remote-curl
.
c: fi
x
rpc_out
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ha
m
a
n
o
Pr
o
tect sc
r
ipted Porcelains fro
m
GREP_O
P
TIO
N
S ins
a
nity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
me
r
getool--lib: simpli
f
y g
u
ess_merge_tool(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
René Schar
f
e
s
t
rbuf_add_wrapped_text():
s
kip over c
o
lou
r
code
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
J
o
hannes Sixt
t401
4
-format-pat
c
h: d
o
not assume 'test' is available
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Björn
Gu
s
tavsson
Fix ov
e
r-s
i
m
plified documentation for
'
git log -
z
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio
C Hamano
Add tr
i
vial tests for --std
i
n
o
p
tion
to
l
og family
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Haman
o
M
e
rge branch
'
b
g/fetch-multi'
commit
|
commitdiff
|
tree
2009-11-23
Christian Couder
b
isect
:
simplify
c
alling vi
s
ual
i
zer using
'--bisect
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Mar
t
in Storsjö
D
i
s
a
ble CURLOPT_
N
OBODY b
e
fore enablin
g
CURLOPT_PUT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Matt
h
ew Ogilvie
config
do
c
umentation:
s
o
me configs are a
u
to
-
set by
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Matthew Ogilvie
cvsserver
d
o
c
: dat
a
b
a
se gen
e
r
a
lly c
a
n not be reprodu
c
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio
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
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
i
o
C H
a
mano
Merge git://git
.
b
ogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-11-23
Junio C
H
amano
Merge
b
r
anch 'th/maint-r
e
mote-update-
h
elp-s
t
ring'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C Hamano
Merge branch
'
jn/f
a
s
t
er-comple
t
io
n
-startup'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
H
a
mano
Merge branch 'r
j
/m
a
int-t
9
700'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hama
n
o
Merg
e
bra
n
ch
'
ls/maint-mailinfo-no-inbody'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branch 'mo/maint-c
r
lf-doc'
commit
|
commitdiff
|
tree
2009-11-23
Junio C H
a
mano
Merg
e
branch 'th/
r
emote-us
a
ge'
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o C Hamano
Me
r
g
e
b
ranc
h
'pb/maint-use-custo
m
-perl'
commit
|
commitdiff
|
tree
2009-11-23
J
u
nio
C Hamano
Merge
branch 'mm/config-pathname-ti
l
de-exp
a
nd'
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Hamano
Merge branch
'
bc/gre
p
-i
-
F'
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Ham
a
no
Merge b
r
a
n
ch 'jk
/
maint-
b
reak-rename
-
reduce-memory'
commit
|
commitdiff
|
tree
2009-11-23
J
unio C Hamano
M
erg
e
branch
'
tc/format-attribut
e
'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
H
a
m
a
no
Merge branch 'tr
/
main
t
-merge-ours-
c
l
arification'
(early
.
.
.
commit
|
commitdiff
|
tree
2009-11-23
Re
n
é Scharfe
l
og --format: docu
m
e
n
t %w
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
str
b
uf_a
d
d_wra
p
ped_tex
t
(): fact
o
r out strbuf_add
_
indented
_
text()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
gre
p
:
unset
G
REP_OPTIONS
b
e
f
ore spawni
n
g external grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
B
j
örn Gus
t
avsson
User
M
anual:
Write "Git" instead of
"
GIT"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Björn
Gustav
s
so
n
Fix
t
runcate
d
usage me
s
s
a
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu M
o
y
u
ser-manual: Document t
h
at "git merge" doe
s
n
'
t
like
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Matthi
e
u Mo
y
merg
e
-re
c
urs
i
ve: po
i
nt the u
s
er to c
o
mmit when
f
i
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-22
Björn G
u
stavsson
apply: Use t
h
e
ter
m
"working tr
e
e" cons
i
st
e
n
tly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-22
Björn Gustavsson
ap
p
ly: Format
all o
p
t
ions using back-q
u
ote
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-22
Bjö
r
n Gustavsson
apply: a
p
ply works outside a r
e
po
s
i
tory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-22
B
jörn Gustavsson
Clarify and correct
-
z
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Juni
o
C
Hamano
D
ocumentation:
avoid xmlto i
n
p
ut error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
H
a
m
ano
Merge bra
n
ch
'
jc/f
i
x-tree-walk' (early part
)
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
io
C
Hamano
Merge branch 'jh/notes' (ea
r
ly
par
t
)
commit
|
commitdiff
|
tree
2009-11-21
Junio C Haman
o
Merge b
r
anch 'sp/smart-http'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Ha
m
an
o
Merge branch
'bw/autoconf-more'
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
i
o C Hamano
Merge
b
ranch
'
jn/editor-pager'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge b
r
anch 'rj/cy
g
wi
n
-msvc'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C H
a
mano
M
erge branch
'rj/maint-simplify-cygw
i
n-make
f
ile'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Me
r
ge
branch
'bg/forma
t
-p
a
tch-doc-up
d
ate
'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C Ha
m
ano
Merge bra
n
c
h 'tr/filter-branch'
commit
|
commitdiff
|
tree
2009-11-21
Junio C H
a
mano
M
e
rge
b
ranch 'sc/protocol-do
c
'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C Haman
o
Merge branch 'jl/s
u
bmodule
-
add-nona
m
e'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
M
e
rge branc
h
'sb
/
l
s
-tree-parseopt'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
Ha
m
ano
Merge branch 'rg/d
o
c
-workflow'
commit
|
commitdiff
|
tree
2009-11-21
Jun
i
o
C Hamano
Merge bran
c
h 'jn/gitweb-log-history
'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Haman
o
Merge bran
c
h 'jn/hel
p
-everywhere'
commit
|
commitdiff
|
tree
2009-11-21
Junio C
H
amano
Merge bran
c
h 'j
p
/
f
etch-cull-m
a
ny-refs
'
commit
|
commitdiff
|
tree
2009-11-21
Rama
n
G
u
p
t
a
Add branch mana
g
ement for releases
to gitworkf
l
o
w
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Lukas Sandström
git am/m
a
ilinfo:
Don
'
t look at in
-
body headers when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Tim Henigan
git
r
emote:
S
e
parate usage string
s
f
or
s
ubcomman
d
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Ha
m
a
no
diffcore-r
e
name: reduce memor
y
foot
p
r
int by freeing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Chri
s
t
i
a
n Coud
e
r
Docu
m
entati
o
n:
t
alk a little
bit abo
u
t GIT_N
O
_REPLA
C
E_OBJECTS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
C
h
ri
s
t
i
an Co
u
der
Documentation: fi
x
typos and sp
e
l
l
ing in replace
documenta
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Christian
C
o
u
der
replace:
use a GIT_NO
_
REPLAC
E
_OBJECTS
e
nv variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Thomas Rast
d
e
scribe: do not
u
se unannotated
tag even
i
f exact
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c:
S
quelch a "use before assignm
e
n
t
"
warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Junio C Hamano
Make --std
i
n option to "log" fami
l
y read also pat
h
spec
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Junio
C
Hamano
setup_
r
evi
s
io
n
s(): do not call get_p
a
thspec(
)
to
o
ea
r
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Jun
i
o C
H
aman
o
Teach --stdin op
t
ion t
o
"log" family
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Junio C
Hamano
read_rev
i
sion_fr
o
m
_stdin(): use strbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Ram
s
a
y Jones
git-count-objects: Fix a disk-spac
e
u
nder-estimate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Gr
e
g
Price
Documentation: undo
c
um
e
nt gc'd funct
i
on gr
a
p
h
_re
l
ease
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
R
a
msay Jones
t9700-p
e
rl
-
git
.
s
h: Fix a test failure on Cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-19
Matthieu Mo
y
expand_u
s
er_path: expand ~ to $HOME, n
o
t
to the actual
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next