repo.or.cz
/
git
/
jnareb-git.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
Avery P
e
n
n
arun
T
each gi
t
-pul
l
to pass -X<opti
o
n>
to
git-
m
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery P
e
nna
r
un
git merge -X<op
t
i
o
n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
gi
t
-merge-file --ours, --theirs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge remote bran
c
h 'ko/master' into HEAD
commit
|
commitdiff
|
tree
2009-11-30
Avery Pennarun
builtin-merge
.
c
:
call ex
c
lude_cmds
(
) correct
l
y
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
Update draft release
note
s
to
1
.
6
.
6 b
e
fore me
r
ging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
J
o
n
at
h
an Nieder
Makefile: do not clea
n
arm directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
i
o C Ham
a
n
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-11-27
Johannes S
i
xt
Add a not
i
ce that only
c
ertain func
t
ions c
a
n
p
rint
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
u
nio C Hama
n
o
b
uiltin-appl
y
.
c
:
pa
y
attention to -p<n>
when d
e
termining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
B
j
örn Gu
s
tavsson
gitworkflows: Consistently bac
k
-quote git
c
ommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Haman
o
Merge bran
c
h 'rs/work-a
r
ound-gr
e
p-opt-insan
i
ty'
commit
|
commitdiff
|
tree
2009-11-25
Benjamin Kramer
Expli
c
itly t
r
uncate bswap operand to uint32_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Nanako
Shiraishi
t1200: fix a timing dependent er
r
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
i
o
C Hamano
Me
r
ge branch '
r
j/
m
aint-cygw
i
n
-
count-objects'
commit
|
commitdiff
|
tree
2009-11-24
C
hristi
a
n
C
ouder
D
o
cumen
t
ation
:
upda
t
e descriptions of revisio
n
options
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
M
arti
n
St
o
r
sjö
E
n
able
support for IPv6 on
M
inGW
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
M
a
rtin S
t
orsjö
Refactor winsock
i
nitializa
t
i
o
n in
t
o a s
e
para
t
e fu
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io C H
a
m
ano
Merge branch 'rs/color-esca
p
e-h
a
s-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ham
a
no
Merge br
a
n
ch 'bg
/
apply-doc'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C H
a
mano
M
e
rge branch 'mm
/
maint-hint
-
fa
i
led-merge'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ham
a
n
o
Merge branch 'j
c
/log-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
M
erge branch 'mr/gitwe
b
-s
n
apshot'
commit
|
commitdiff
|
tree
2009-11-24
B
r
i
a
n Gern
h
ardt
t
/
gitw
e
b-li
b
: Split HTT
P
response with n
o
n-GNU sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C Hamano
Merge branc
h
'
c
c/
r
epl
a
c
e'
commit
|
commitdiff
|
tree
2009-11-24
J
unio C Hama
n
o
Merge
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2009-11-24
Nicolas P
i
tre
pack-objects: s
p
lit implications of --
a
ll-prog
r
ess
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Stephen
B
oyd
instaweb: res
t
art server if alre
a
dy run
n
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jef
f
King
prune-packe
d
: only show progress when stde
r
r is a tty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Tay Ra
y
Chuan
re
m
ote-curl
.
c: fix
rpc_o
u
t
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
m
an
o
Protect sc
r
ipted Porc
e
lains from GR
E
P_OPTIONS in
s
anity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
R
e
n
é
S
c
harf
e
m
ergetool--lib:
s
implify
guess_merg
e
_tool
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René S
c
h
arf
e
strbuf
_
a
d
d
_w
r
a
pped_text():
s
k
i
p over colour co
d
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Johannes Sixt
t4014-format-p
a
tch: do not assume 't
e
st' i
s
availab
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Björn Gu
s
tavsson
Fix
over-simplified docu
m
entation for 'git
lo
g
-z'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
A
d
d trivial tests f
o
r --
s
tdin
optio
n
to log family
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Hamano
M
e
rge
branch 'bg/fetch-
m
ulti'
commit
|
commitdiff
|
tree
2009-11-23
Christ
i
a
n Couder
bisect: simplify calling visual
i
ze
r
using
'
-
-bisect
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Martin Stor
s
j
ö
Disable
C
URLOPT_NOBODY
b
e
fo
r
e enabl
i
ng CURLOP
T
_P
U
T
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
M
a
tt
h
e
w
Ogilvie
co
n
fig
d
ocumentation: some c
o
nfi
g
s are
a
uto-set
by
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthew Ogilv
i
e
cvsserver do
c
: database gener
a
lly can not be rep
r
od
u
ced
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Git v1
.
6
.
6
-
r
c
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
J
u
nio
C H
a
mano
Merge
b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ha
m
ano
M
erge g
i
t
:
/
/
g
it
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
Hamano
M
erg
e
branc
h
'th/maint-remote-up
d
ate-hel
p
-string'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
M
e
rge branch 'jn/faster-co
m
pletion-star
t
up'
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
io C
Hamano
Merge branch 'rj
/
maint-t9700'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge
branch 'ls
/
maint-mailinfo-no-inbody'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ham
a
n
o
Merg
e
branch 'mo
/
m
aint-cr
l
f
-doc'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ha
m
ano
Merge branch 'th/remo
t
e-usage'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
M
erge
branch '
p
b/ma
i
nt-us
e
-cu
s
tom-perl'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C H
a
mano
Merge branc
h
'mm/config-p
a
thnam
e
-tilde-expand'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge b
r
anch
'bc/gre
p
-i-F'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Haman
o
Me
r
ge branch 'jk/maint-break-renam
e
-reduce
-
memory'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge b
r
anch 'tc/format
-
a
t
t
r
ibute'
commit
|
commitdiff
|
tree
2009-11-23
J
u
n
io
C
Hamano
Merge
b
ranch
'tr/maint-mer
g
e-ours-clarification'
(early
.
.
.
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
log --format: docum
e
nt %w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
R
e
né
S
charfe
strbuf_add_wrap
p
ed_te
x
t():
f
actor out st
r
b
uf
_
a
d
d
_
indented_tex
t
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René Scharf
e
grep: unse
t
GREP_O
P
T
IONS before spawning
e
xter
n
al gr
e
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Björn Gustavsson
U
s
e
r Manual
:
W
rite
"
Git
"
instead o
f
"GIT"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Björ
n
G
usta
v
sson
Fix t
r
un
c
a
t
ed usage
m
e
ssa
g
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Mo
y
u
ser-manual:
Document that "git me
r
g
e" doesn't like
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu
Moy
merge-recursiv
e
: point the user t
o
c
ommit when fi
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-22
B
j
ör
n
Gu
s
tav
s
son
ap
p
ly: U
s
e
the term
"wor
k
ing tree"
consistently
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-22
Björn
G
u
stavsson
apply: Format all o
p
t
i
ons usin
g
back-q
u
otes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-22
Björn
G
ustavsson
app
l
y: appl
y
w
orks outside a rep
o
sito
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-22
Bjö
r
n Gustav
s
son
Cl
a
rif
y
and correct -z
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio
C Hamano
Docu
m
enta
t
ion: avoid
xmlt
o
input
e
r
r
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C
H
amano
Merge
b
ranch 'jc/fix-tr
e
e-w
a
lk' (early part)
commit
|
commitdiff
|
tree
2009-11-21
Junio C Haman
o
Merge b
r
anch 'jh/n
o
te
s
'
(early part
)
commit
|
commitdiff
|
tree
2009-11-21
Junio
C Hamano
Merg
e
branch 'sp/sma
r
t-
h
t
t
p'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
H
amano
Merge branc
h
'bw/au
t
oconf-
m
or
e
'
commit
|
commitdiff
|
tree
2009-11-21
J
unio C Haman
o
Merge branch 'jn/editor-pager'
commit
|
commitdiff
|
tree
2009-11-21
J
un
i
o
C Ha
m
ano
M
erge
bra
n
ch 'rj/
c
ygwin-ms
v
c
'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge
branch 'rj/mai
n
t-s
i
mp
l
ify-cygwin-makefile'
commit
|
commitdiff
|
tree
2009-11-21
Jun
i
o C
H
a
m
ano
Merge branch '
b
g/format-patch-d
o
c-update
'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Ham
a
no
Merge branch
'tr/fi
l
t
e
r-
b
ranch'
commit
|
commitdiff
|
tree
2009-11-21
Juni
o
C Hamano
Merge branch 's
c
/protocol-doc'
commit
|
commitdiff
|
tree
2009-11-21
Jun
i
o C Hamano
Mer
g
e
branch 'jl/sub
m
odule-
a
dd-noname'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C Hamano
Merge
branc
h
'sb/ls-tree-parseopt'
commit
|
commitdiff
|
tree
2009-11-21
J
u
n
io
C Hamano
Merge branch 'rg/d
o
c
-workflow'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge branch 'jn/gi
t
we
b
-lo
g
-history
'
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
i
o C Hamano
Me
r
g
e
b
ranch 'jn/h
e
l
p
-
e
verywhere'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
M
e
rge branch 'jp/fetch-c
u
l
l
-m
a
ny-refs'
commit
|
commitdiff
|
tree
2009-11-21
Raman Gup
t
a
Add branc
h
management for
r
el
e
ases to gitworkfl
o
ws
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Lukas Sand
s
tröm
git
a
m/mailinfo: Don'
t
look at
in-bod
y
headers when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Tim Henigan
git remote: Separate usag
e
strings for subcomm
a
n
ds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C
Ham
a
no
dif
f
co
r
e-rename: reduce m
e
mory f
o
otpri
n
t
b
y
freeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Christia
n
Couder
Docu
m
entation
:
talk
a
little bit about GIT_NO_
R
EPLACE_OBJECTS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Christian
C
ouder
D
ocum
e
n
t
ation:
fix ty
p
os an
d
sp
e
lling
in repl
a
ce d
o
cumentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Christi
a
n C
o
uder
repla
c
e: use a GIT_NO_REPLACE_OBJECTS
e
nv varia
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Th
o
mas Rast
describe: do not use
un
a
nn
o
tated tag even if exact
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
David Agui
l
ar
submodule
.
c:
S
qu
e
l
c
h a
"
use bef
o
re assign
m
ent" wa
r
n
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Junio C Hamano
Make --
s
tdin option to "l
o
g" family read al
s
o pa
t
hspec
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Jun
i
o
C Hamano
s
e
t
up_rev
i
sion
s
(
)
: do not call get_
p
athspec()
t
o
o ea
r
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Juni
o
C
H
amano
Teach --stdin option t
o
"l
o
g
" family
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Junio C H
a
m
a
n
o
re
a
d_r
e
vision_from_s
t
d
in(): use strb
u
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay
Jones
git-count-objects: Fix a disk-spac
e
unde
r
-est
i
mate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
G
reg Price
Doc
u
mentatio
n
: undocumen
t
g
c
'd function graph_r
e
lease()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jones
t
9700-p
e
rl-
g
it
.
sh: Fix a test failure on Cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next