repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5
2010-01-20
J
un
i
o
C
H
a
m
ano
Merge branch 'jk/maint-1
.
6
.
5-reset-har
d
' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
Merge br
a
nch 'tr/ma
i
nt-
1
.
6
.
5-bash-prompt
-
s
h
o
w-subm
o
dule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
ma
n
o
M
e
rge branch '
d
p/maint-1
.
6
.
5-fast-import-
n
o
n
-
commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C
Hamano
Me
r
g
e
branch 'jm/maint-1
.
6
.
5
-
gr
e
p-NUL-ter
m
inate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge branc
h
'maint
-
1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e bra
n
ch
'maint-1
.
6
.
3' into main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge branch
'
m
a
int-1
.
6
.
2' into ma
i
nt
-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge commit
'
v
1
.
6
.
4
.
4
-8-
g
8de6518' into
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o
C Hamano
Fix mi
s
-backport of t7
0
02
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jim Meye
r
ing
grep: N
U
L
t
e
rminate inp
u
t from a fil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
m
itry Potapo
v
fast-import: t
a
g
may point t
o
an
y
object t
y
pe
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hamano
M
erge br
a
nch '
m
aint-1
.
6
.
1'
into
m
a
i
n
t
-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hamano
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-10
An
d
reas
G
ruenbacher
base85: Make the code more obvious instead of e
x
plainin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
A
n
d
rea
s
G
ruenbache
r
b
a
se85: encode_85() does
n
ot use
the deco
d
e
tabl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
An
d
reas
Gr
u
enbacher
b
a
se85 debug code: Fix len
g
th byte ca
l
culation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
J
unio C
H
amano
c
h
ec
k
out -m: do not try to
fal
l
back to -
-
merge from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-31
Matthieu
M
oy
branch: die explicitl
y
why
w
hen calli
n
g
"git
b
ranch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-31
Thomas Rast
ba
s
h completi
o
n: facto
r
s
ub
m
odul
e
s int
o
dirty state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Jeff Ki
n
g
textcon
v
: stop leaking file descripto
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Je
f
f King
r
eset: unb
r
eak
h
ard
r
esets with GIT_W
O
R
K
_
TREE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Junio
C
H
amano
Merge branch 'maint
-
1
.
6
.
0'
i
nto maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-30
G
r
eg Price
c
o
mmit: --cleanup is a messa
g
e
o
ptio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Andreas Schwab
g
i
t count-obj
e
cts:
han
d
le
p
acks bigger than 4G
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Nguy
ễ
n
T
hái Ngọc Duy
t7102: make the t
e
st fail if one of its che
c
k fails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Davi
d
Re
i
ss
Preven
t
g
it blame f
r
om se
g
f
a
ulting on a miss
i
ng author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Björn Gustavsson
rebase -i: abort cleanly if th
e
editor fails to launch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
St
e
phen B
o
yd
tech
n
ica
l
-docs
:
d
o
cumen
t
hash AP
I
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Bo
y
d
api-
s
t
r
buf
.
t
x
t: fix typ
o
s and documen
t
launch_editor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io C Ha
m
ano
workt
r
ee: don't segfault with an a
b
solu
t
e
pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Jef
f
King
igno
r
e unkno
w
n color configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Joha
n
nes
Six
t
h
e
lp
.
autoc
o
rrect: do n
o
t run a comma
n
d
if the command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
N
a
nako Shira
i
shi
Illus
t
ra
t
e "
f
ilter" attribute with an
exampl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
Hamano
G
i
t 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C Hamano
Fix archive format wi
t
h -
-
on t
h
e command line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C Hama
n
o
Remove post-
u
pload-hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Ha
m
a
n
o
Merg
e
branch 'mm/maint-merge-ff-error-me
s
sage-fix
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
i
o
C Hamano
Merge branch 'jn/maint-
p
ul
l
-rebase-error-message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'jk/m
a
i
nt-add-p-de
l
ete-
f
i
x
' int
o
maint
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-interactive: fi
x
d
e
l
etion of
n
on-empty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jun
i
o
C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torva
l
ds
F
i
x di
f
f
-
B/-
-
dirstat miscou
n
ting
o
f newly added contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset
:
i
mprov
e
worktree safe
t
y
valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
To
d
d Zull
i
n
g
er
Do
c
umentation
:
Avoid
u
se of xmlto --st
r
ingpara
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René
S
charfe
arch
i
ve: cla
r
ify des
c
ripti
o
n of path parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff Ki
n
g
re
r
ere: don't segfault
on fail
u
re t
o
open rr-ca
c
h
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Prepare for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Haman
o
Merge bra
n
ch 'uk/main
t
-shortlog-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
H
amano
M
erge bra
n
ch
'fc
/
m
a
in
t
-form
a
t-p
a
tch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Haman
o
Merge branc
h
'ap/main
t
-merge-stra
t
egy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ham
a
no
Merge b
r
a
n
ch
'
jc/maint-am-ke
e
p' into
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
no
Merge b
r
anc
h
'
rs/work-around-grep-opt-ins
a
nity'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h 'rj/maint-cygwin-c
o
unt
-
objects' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch 'mm/
m
ain
t
-h
i
nt-fail
e
d-merge'
in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
an
o
Merg
e
bran
c
h 'th/main
t
-re
m
ote-
u
pdate-
h
e
lp-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge
branch 'rj/maint-t9700' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ha
m
a
no
Merge b
r
anch 'ls/m
a
int-mailinfo-no-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch 'mo/main
t
-crlf-doc' into
m
a
in
t
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Ha
m
ano
Merg
e
branch 'th
/
remote-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branc
h
'pb/maint-use-custom-
p
erl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch
'
mm/config-path
n
ame-tilde-expan
d
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'bc/grep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merg
e
b
ranch 'jk
/
maint-break-re
n
ame-reduce-mem
o
ry'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'rj/maint-simpli
f
y-cygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C H
a
ma
n
o
Merge branch '
r
g/d
o
c
-
w
orkflow' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge
branch 'np/maint-sideban
d
-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Haman
o
Do
c
um
e
ntation: xmlto
0
.
0
.
18
does not know
-
-
s
tringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t4201: use ISO8859-1 rather th
a
n ISO-8859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüge
r
p
u
ll
:
c
lar
i
fy advice for the
unco
n
figured error ca
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Git
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ha
m
ano
Unconditi
o
na
l
ly se
t
ma
n
.
base
.
u
r
l
.
f
o
r
.
relati
v
e
.
lin
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Pre
p
are
f
or 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
m
erge:
d
o not add standa
r
d message whe
n
mess
a
ge is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do no
t
mis
i
dentify
"g
i
t m
e
rge foo HEAD" a
s
an old-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
avid
A
guilar
help: Do not unnecessarily look
f
or a
r
e
p
ositor
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
M
ic
h
ael J Gruber
Documenta
t
ion: Fix a few i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Davi
d
So
r
ia Parra
Docume
n
tation: Document --
b
ra
n
ch option i
n
g
it clone
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Mat
t
hieu Moy
bu
i
l
t
in-merge: sho
w
user-fr
i
en
d
l
y er
r
or messages for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
M
a
t
th
i
eu Moy
merge-recursive: make the erro
r
-message generation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Avery
Pennarun
buil
t
i
n
-m
e
rge
.
c:
c
all exclude_cmds(
)
correctl
y
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
J
u
n
io
C Hamano
R
emov
e
dea
d
cod
e
fr
o
m "git am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
F
elipe Contreras
form
a
t
-
patch: add test fo
r
parsing of "--"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contreras
forma
t
-patch
:
fix
pars
i
ng o
f
"--" on the command line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
i
o C Haman
o
buil
t
in-apply
.
c: pay attent
i
on to -
p
<n> when determining
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Uwe
Kleine-K
ö
nig
s
h
o
r
t
l
og: respec
t
commit enc
o
ding
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Nicol
a
s Pitre
p
a
ck-obje
c
ts: split implic
a
tions of --all
-
progress
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Stephen B
o
yd
in
s
taw
e
b: restart
server
if already run
n
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
prune-pac
k
ed: only show progress when stderr is a tty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C Haman
o
Protect scrip
t
ed
P
orcelains
from
G
REP_OPTIONS insa
n
it
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
René
Scharfe
me
r
g
e
t
ool--lib: simpli
f
y guess_mer
g
e
_tool()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
user-manual: Document that "g
i
t
merge"
d
oesn
'
t like
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu
M
oy
merge-recursive: point the user to commi
t
whe
n
f
i
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Jun
i
o C
Hamano
Do
c
umentation:
a
void
xmlt
o
input er
r
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Raman
G
u
p
ta
Add branch management for
r
eleases to g
i
tworkf
l
ows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Lukas Sands
t
röm
git am
/
ma
i
lin
f
o: Don't look at in-body header
s
when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Tim Hen
i
ga
n
git remote: Sep
a
rate usage st
r
i
n
gs for s
u
bcommands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
J
u
n
io
C
Hamano
diffcore-
r
ename:
r
educe memor
y
footp
r
int by free
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jon
e
s
git
-
c
o
unt-objects: Fix a disk-sp
a
ce un
d
er-
e
st
i
mat
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Gr
e
g Price
D
oc
u
mentat
i
on
:
u
n
document gc'd fun
c
tion graph_release()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next