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
v
ery Penn
a
r
un
Te
a
ch
git-pull to pass -X<option> to gi
t
-merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
v
er
y
Pennarun
git merge -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
g
i
t
-merge-file -
-
ours, --thei
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Ha
m
ano
Merge remote branch 'ko/m
a
ster' into H
E
AD
commit
|
commitdiff
|
tree
2009-11-30
Avery
Pennarun
builtin-merge
.
c: cal
l
exclude_cmds() cor
r
ectly
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
J
unio C H
a
mano
Update draft rel
e
a
se notes to 1
.
6
.
6 before merging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jonathan Nieder
Makefile: do n
o
t clean a
r
m directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C H
a
m
a
no
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-11-27
Johan
n
es Sixt
Add a notice that only certain fun
c
t
i
ons can print
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C
Hama
n
o
b
u
i
lt
i
n-apply
.
c: pay atte
n
tion to -p<n> w
h
en
deter
m
i
ning
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Bj
ö
rn Gustavsso
n
gitwork
f
lows: C
o
nsistent
l
y bac
k
-quote git comma
n
ds
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Juni
o
C Hamano
Me
r
g
e
branch 'rs/wor
k
-around-gre
p
-opt-in
s
anity'
commit
|
commitdiff
|
tree
2009-11-25
Benjamin Kramer
Explici
t
ly t
r
uncate bswa
p
operand t
o
u
int
3
2
_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
N
a
nako
S
hiraishi
t
1
200: fix a timing dep
e
ndent er
r
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
Hama
n
o
M
e
r
g
e bra
n
c
h
'
r
j/maint-cygwin-c
o
u
nt-objects'
commit
|
commitdiff
|
tree
2009-11-24
Christian
Couder
Document
a
tion: updat
e
d
e
sc
r
ipt
i
ons of revision optio
n
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
M
a
rtin St
o
rsjö
Enable
support for
IPv6 on MinGW
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Martin Storsjö
Re
f
act
o
r winsock initialization int
o
a
s
eparate function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C Hamano
M
e
rge branc
h
'rs/color-escape-has-zero-
w
idth'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io C Hamano
M
e
rge br
a
nch 'bg
/
a
p
ply-doc
'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io C Hamano
Merge branch 'mm/main
t
-hint-failed-merge'
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
ma
n
o
M
erge branch 'jc/log-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C Ham
a
no
Merge b
r
an
c
h 'mr/gitweb-
s
naps
h
o
t'
commit
|
commitdiff
|
tree
2009-11-24
B
ria
n
Gernhardt
t/gitweb-lib:
S
p
l
it H
T
TP res
p
onse wi
t
h non-GNU sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
M
erge branch
'cc/replace'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-11-24
N
i
colas Pitre
pa
c
k-objects: spl
i
t implicatio
n
s
of --
a
ll-pro
g
ress
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Stephen Boyd
in
s
taw
e
b: restart ser
v
er if
a
l
ready runnin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Jeff Kin
g
p
r
une-
p
acked:
only show progress whe
n
stderr is a
t
ty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Tay Ray Chuan
r
e
mote-c
u
rl
.
c
:
fix rpc_out()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
P
r
otect
scr
i
p
t
ed Po
r
c
elains
f
r
o
m GREP_OPTIONS insanity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
mergetool--lib
:
s
imp
l
ify gue
s
s_m
e
r
ge_tool()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
René Scha
r
f
e
strbuf
_
add_
w
rapped
_
text(
)
: skip ove
r
c
o
l
o
ur codes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Johannes Sixt
t40
1
4-format-patch: do not ass
u
me 'test'
i
s ava
i
l
a
ble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Björn
G
ustav
s
son
Fix
o
ver
-
simp
l
ified
docume
n
tat
i
o
n
f
o
r 'g
i
t log -
z
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
J
u
nio
C
H
a
mano
Ad
d
trivia
l
tests fo
r
-
-stdin opti
o
n t
o
l
o
g family
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
H
a
ma
n
o
Merg
e
branch 'bg/fetch-multi'
commit
|
commitdiff
|
tree
2009-11-23
Chri
s
tian C
o
uder
bisect: simplify calli
n
g visu
a
lize
r
u
sin
g
'--b
i
sect
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Mart
i
n
S
torsjö
Disable CURLOPT_NOBO
D
Y befo
r
e enabl
i
ng CU
R
L
O
P
T_PUT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
M
a
tthew Ogilvie
config docum
e
ntation: some configs are auto-s
e
t by
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Matt
h
ew Ogi
l
vie
cvsserver doc:
database gener
a
lly can not be reproduced
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
i
o
C Hamano
Git
v
1
.
6
.
6-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge b
r
an
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-11-23
J
unio C Hamano
Mer
g
e git:
/
/
git
.
bogo
m
ips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C
Hamano
M
er
g
e branch
'
th/main
t
-remote-update-help-st
r
in
g
'
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
io C H
a
man
o
Merge bra
n
c
h
'jn/
f
aster-complet
i
on-startu
p
'
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o
C Hama
n
o
Merg
e
branch 'rj/maint-t9700'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Me
r
ge bran
c
h
'ls/
m
aint-mailinfo
-
n
o-inb
o
dy'
commit
|
commitdiff
|
tree
2009-11-23
J
un
i
o C Hamano
Me
r
ge branch 'mo/ma
i
nt-crlf-d
o
c'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
M
e
rge
b
ran
c
h '
t
h/remote-usag
e
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ham
a
no
M
e
rge branc
h
'pb/main
t
-use-custom-perl'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branch 'mm/co
n
f
i
g
-
pathname-tilde-expand
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
H
amano
Me
r
ge branch 'bc/grep-i-F'
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
i
o
C Hamano
Merge branch
'
jk/maint-break-renam
e
-redu
c
e
-me
m
ory'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
M
e
rge branch 'tc/format-attribute'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
Hamano
Merge br
a
nch '
t
r/maint-mer
g
e-
o
u
r
s-clarific
a
tion' (ear
l
y
.
.
.
commit
|
commitdiff
|
tree
2009-11-23
Ren
é
S
c
harfe
log --for
m
at: do
c
ument %w
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
st
r
buf_ad
d
_wrapped_t
e
x
t(): f
a
ctor out s
t
rb
u
f_
a
dd_
i
ndented_text()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
René S
c
harfe
g
r
ep: unse
t
GREP_OPTIONS before spawning ext
e
r
n
al g
r
e
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Bj
ö
rn Gus
t
avs
s
o
n
U
s
e
r Manual: Wr
i
te "Gi
t
" inste
a
d
o
f "G
I
T
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Björn G
u
stavss
o
n
Fix truncated usage messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Matth
i
eu
Moy
user-m
a
nual
:
Document th
a
t "git merge" doesn't like
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
M
a
tthieu M
o
y
me
r
g
e-recursiv
e
: point the
u
ser to co
m
mi
t
when file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-22
B
j
örn Gu
s
tavs
s
on
apply
:
Use the term "working
t
ree" consistent
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-22
Björn
G
ustavs
s
on
apply: Format all optio
n
s using back-q
u
otes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-22
Björn Gust
a
vsson
a
p
pl
y
: ap
p
ly works outsid
e
a repository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-22
B
jörn G
u
st
a
v
s
son
Cl
a
r
i
f
y
a
n
d correct -z
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Ham
a
no
Document
a
tio
n
:
av
o
id xmlto
i
nput error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Jun
i
o
C
H
a
m
ano
Merg
e
br
a
nch
'
jc/fix-tree-walk' (early part)
commit
|
commitdiff
|
tree
2009-11-21
Junio
C Hamano
Merge branch 'jh/notes' (early part)
commit
|
commitdiff
|
tree
2009-11-21
Jun
i
o C Hamano
Merg
e
branch 'sp/
s
mart-http'
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
io C Hamano
Merge branch
'
b
w/
a
uto
c
onf-more'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C Hamano
Merge
bra
n
ch 'jn
/
editor-pager'
commit
|
commitdiff
|
tree
2009-11-21
J
u
nio
C
Hamano
Merge branch 'rj/cygwi
n
-msvc'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge branch 'rj/maint-
s
implify
-
cygw
i
n
-
makefil
e
'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C Hamano
Merge branch 'bg/for
m
at-patch
-
doc-update'
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
io C Ham
a
no
M
e
rge branch 'tr/fil
t
er-branch'
commit
|
commitdiff
|
tree
2009-11-21
Junio C H
a
m
ano
Merge branch 'sc/protoco
l
-doc'
commit
|
commitdiff
|
tree
2009-11-21
Jun
i
o C Hamano
M
e
rge
b
r
a
nch 'jl/submodule
-
add-nonam
e
'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
Hamano
Merge branch
'sb
/
ls-tree-p
a
rseopt'
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
io C Ham
a
n
o
Merge branc
h
'rg/
d
oc-
w
orkflo
w
'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Ham
a
no
M
e
rge branch 'jn
/
gitweb-log-history'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge branch 'jn/help-everyw
h
ere'
commit
|
commitdiff
|
tree
2009-11-21
Juni
o
C Hamano
M
e
rge branch 'j
p
/fetch-cull-many-refs
'
commit
|
commitdiff
|
tree
2009-11-21
Raman Gupta
Add branch management for releases to gitwor
k
flows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Lukas Sands
t
röm
git a
m
/mailinfo
:
Don't loo
k
at i
n
-body
heade
r
s when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Tim Henigan
git r
e
mot
e
:
Separ
a
te u
s
age
st
r
ings for subcommands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
io C Ha
m
ano
diffcore-rename: reduce memo
r
y f
o
otprint by freeing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Christian
C
ouder
Docum
e
ntation: t
a
l
k
a
little bit about G
I
T_
N
O_REPL
A
CE_OBJEC
T
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Ch
r
istian Couder
D
o
cumentat
i
on: fix typos and spel
l
ing i
n
re
p
l
ace docu
m
entation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Christian
C
ouder
replace: use a
GIT_NO_REPL
A
CE
_
OBJEC
T
S env variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Thomas Rast
descri
b
e: do not use un
a
nnotated tag e
v
en if exact
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
David
A
gu
i
lar
s
u
bmodule
.
c
:
Squelch a "
u
s
e b
e
fore a
s
signmen
t
"
warn
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Junio C Hamano
M
a
k
e --stdin option to
"lo
g
"
f
a
mily
read also paths
p
ecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Jun
i
o C Hama
n
o
setup_
r
e
v
i
s
io
n
s(): do not
c
a
ll g
e
t_pathspec()
t
oo
early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Juni
o
C Hama
n
o
Teach -
-
s
t
d
in
o
ption
t
o
"
l
og" family
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Junio
C
H
ama
n
o
r
ead_revision_fro
m
_stdin(): use
str
b
uf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Ram
s
ay Jones
gi
t
-count-obje
c
ts: Fix a disk
-
s
p
ace under-est
i
mate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Greg Price
D
ocumentation: undocume
n
t gc'd f
u
nct
i
on graph_relea
s
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jones
t9700-perl-gi
t
.
sh: Fix a test failure
o
n Cy
g
win
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next