repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2009-12-09
Jun
i
o C Hamano
Me
r
ge branc
h
'm
a
int
'
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Haman
o
Me
r
ge branc
h
'mm/maint-me
r
ge-ff-error-messa
g
e-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
Hamano
M
e
r
g
e
branch
'jn/m
a
int-pull-reba
s
e-error-message'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o
C
Hamano
Merge br
a
nch 'jk/maint
-
add
-
p-de
l
ete-fix' into main
t
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
r
ge
g
it://gi
t
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio
C
Hamano
Re
v
ert
recen
t
"git merge <
m
sg> HEAD <commit>
.
.
.
" deprecatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
Jef
f
King
add-int
e
ra
c
t
i
ve: f
i
x deletion of non-empty
f
iles
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
S
ZE
D
ER Gábor
b
ash: updat
e
'git commit'
c
ompletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
Hamano
Sync w
i
th 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
G
i
t 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torvalds
F
ix diff -B/--
d
irs
t
at miscounting of n
e
wly added contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: improve wor
k
tree safety valv
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zulli
n
ger
Documenta
t
i
o
n:
A
void
u
s
e
o
f xmlto --stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René Schar
f
e
archive
:
clarify description of pat
h
param
e
ter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
r
e
r
er
e
: don't segfault
on failure to open rr-c
a
che
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
Pr
e
p
a
r
e
f
or 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch 'uk/maint-
s
hor
t
l
o
g-enco
d
i
n
g
'
into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merg
e
branch 'fc/main
t
-form
a
t-patch-paths
p
ec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o
C Hamano
M
erge
b
ran
c
h 'ap/main
t
-merge-strateg
y
-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
M
e
rge branch 'jc/maint-am-keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Me
r
ge bra
n
ch 'rs
/
work-around-grep-opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
rj/maint-c
y
gwin
-
c
o
unt-objects' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
Merge branc
h
'mm/maint-hint-fa
i
led-merge' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
r
g
e branch 'th
/
maint-remote-upd
a
te-
h
e
lp-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge br
a
nch 'rj/ma
i
nt-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
M
e
r
ge branch 'ls
/
maint-mailinfo-no-inbody' into
m
ai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
M
e
rge branc
h
'mo
/
maint-crlf-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
M
e
rge branch 'th
/
remote-usage' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
M
erge
b
r
anch '
p
b/maint-u
s
e-custom-p
e
rl' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Merge br
a
nch 'mm/co
n
fig-p
a
t
h
name-
t
ilde-expand
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'bc/g
r
ep-i-F' int
o
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Haman
o
Me
r
ge
b
ranch 'jk/mai
n
t-break-rename-
r
e
d
uc
e
-me
m
ory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io
C Haman
o
Mer
g
e branch '
r
j/main
t
-simplif
y
-cy
g
win-makef
i
le' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch
'rg/doc-work
f
l
o
w' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
H
amano
Merge branch 'n
p
/maint-
s
ideb
a
nd-
f
a
vor-status'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
a
k
ub
Na
r
e
bski
gitweb: Describe (possible) gi
t
web
.
js minificat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
a
no
D
ocumentation: xmlto 0
.
0
.
18 does
n
o
t
know --stri
n
g
p
a
r
am
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
ohan Herland
Fix crash
e
r
on
encountering SHA
1
-
like
n
on
-
not
e
in notes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Cas
e
y
t9001: use o
l
der G
e
topt::Long b
o
ole
a
n
prefix '--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Br
a
ndon Casey
t4
2
0
1: us
e
ISO8859-1 rather
than
I
SO-8859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pull: clarify
adv
i
ce
f
or the unconfigured e
r
ror case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
a
no
Merg
e
in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Unconditionally s
e
t man
.
base
.
url
.
for
.
relative
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Haman
o
G
i
t 1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
von
Brand
gi
t
-
p
ull
.
s
h
: F
i
x
c
all to git-m
e
rg
e
for
n
ew com
m
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
Prepare
f
o
r 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
i
o C Hamano
merge: do not a
d
d standard
mes
s
age when messag
e
is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Hamano
Do no
t
misidentify "gi
t
merge foo
HEAD" as an old-s
t
yle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Hamano
Update d
r
aft
r
eleas
e
notes to 1
.
6
.
6 before -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C H
a
mano
M
erge branch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Hamano
Merge branch 'jc/de
p
recate-old-synta
x
-from-
m
e
r
ge
'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
git-me
r
ge:
a dep
r
ecation n
o
tice of the an
c
ien
t
command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge
b
ranch 'bw/rem
o
te-get-r
e
f-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert
W
e
sarg
g
et_ref_states: strdup entries and f
r
ee util
in sta
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Aguilar
hel
p
: D
o
not u
n
n
e
c
e
s
sar
i
l
y
look
f
or a rep
o
sitory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
Doc
u
men
t
ati
o
n:
Fix a few i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
Merg
e
branch 'jn/
g
itw
e
b-bla
m
e'
commit
|
commitdiff
|
tree
2009-12-01
Jakub N
a
rebski
gitweb: Ad
d
link to other bl
a
m
e implementat
i
on i
n
blame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
aku
b
Narebs
k
i
gi
t
w
eb: M
a
ke linking to actions
r
e
q
uirin
g
JavaScript
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
M
erge branch 'fc/maint-forma
t
-patch
-
pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C
H
a
m
ano
Merge
b
ranch 'mm/m
a
i
nt-merge-ff
-
error-mes
s
age-f
i
x
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
br
a
nch
'ap/mai
n
t-merge-
s
trategy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ham
a
no
Merge br
a
nc
h
'jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Me
r
ge branch 'cc/
b
i
s
ect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C Ha
m
an
o
M
e
r
ge branc
h
'em/commit-clai
m
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
am
a
no
Mer
g
e br
a
nch 'jc/mailinfo-remove-br
a
ckets'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio
C H
a
ma
n
o
M
e
rge branch 'fc/s
e
nd-e
m
ail-envelope
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Me
r
ge branch 'uk/maint-sh
o
rtlog-e
n
co
d
i
n
g'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C H
a
ma
n
o
Me
r
ge branch 'ns/send-email
-
no-chain-r
e
ply-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
H
a
m
ano
Merg
e
branch 'jc/
m
a
int-am-ke
e
p'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hamano
Merge
b
ranc
h
'bw/di
f
f-color-hunk-header'
commit
|
commitdiff
|
tree
2009-11-30
David Sori
a
Parra
Docu
m
entation: Document --branch option
i
n git clone
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
M
atthi
e
u Moy
b
u
ilti
n
-merge: show user-friendl
y
error m
e
ssages
f
or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matth
i
eu Moy
merge-recursive: make
t
he error
-
message generation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
M
atthew Ogilvie
t/README: Document
G
IT
_
TEST_INSTAL
L
ED and GIT_T
E
ST_EXEC_
P
A
TH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Ma
t
thew O
g
i
l
v
i
e
t3409 t4107 t740
6
t915
0
: use dashless commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Avery Pennarun
bu
i
lti
n
-merge
.
c:
cal
l
exclude
_
cmds() co
r
r
ec
t
ly
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthew Ogilvie
t2300: us
e
document
e
d technique to invoke git-sh-
s
etup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-29
Nanako Shirais
h
i
prepare
sen
d
-
e
mail for smoother change
of --cha
i
n
-
r
eply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Ha
m
ano
Update draft release notes to 1
.
6
.
6 befo
r
e merging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jonathan N
i
eder
Makefile: do not clean arm
d
irectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
B
ert
Wesarg
Give the
hunk co
m
ment its own col
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Felipe Contreras
send-email: au
t
omatic envelope sender
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
emit_
l
ine(): don't
emit an empty <SET><RESET> followed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Remove dead code from "g
i
t am
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Merge
br
a
nc
h
'
m
ai
n
t
'
commit
|
commitdiff
|
tree
2009-11-27
Johannes Sixt
Add a
n
otice that onl
y
certain fun
c
tions c
a
n
print
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
F
elipe C
o
ntre
r
as
form
a
t
-
p
atch: add
t
est for parsing of "-
-
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Fel
i
pe Cont
r
eras
format-patch:
f
i
x pars
i
ng
o
f
"
-
-"
o
n the
comma
n
d li
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
J
unio C Hamano
builtin-apply
.
c: pay attention to -p<n> when de
t
ermining
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Björn Gustavsson
g
i
twork
f
lows: Consiste
n
tly back-quote
git
c
ommands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kleine-
K
önig
short
l
og: resp
e
c
t
c
o
mmit encod
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Hamano
Merge branch
'rs/work-around-
g
r
ep-opt-insanit
y
'
commit
|
commitdiff
|
tree
2009-11-25
Benjami
n
Krame
r
Explic
i
tly truncate bs
w
ap opera
n
d to uint32
_
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Stephen Boyd
g
itweb
.
js: f
i
x padLeftStr()
and its usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
J
akub Narebski
git
w
eb
.
js: Harden setting blame
d
commit
i
nfo in incremental
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Nanako Shirai
s
hi
t1
2
00:
fix a ti
m
ing depe
n
dent error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next