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
advice: Introduce error_resolve_conflict
2011-08-04
Ramkumar Ram
a
c
handra
a
dvice: Introdu
c
e error_reso
l
ve_conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-20
Junio C Hamano
Merge branch 'mk
/
g
re
p
-
p
cre'
commit
|
commitdiff
|
tree
2011-06-20
Junio C Hamano
t7810: avoid unport
a
ble
use
of "ec
h
o"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-20
J
im Meyering
p
lug a few c
o
verity-spotted
l
eaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-19
Junio
C Hama
n
o
Merge
b
ranch '
d
i
/n
o
-
n
o-e
x
istant'
commit
|
commitdiff
|
tree
2011-06-19
J
unio
C
Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-06-19
Andreas Schwab
b
uiltin/
g
c
.
c:
add missing
newline in me
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-17
Jef
f
King
tests: l
i
n
k
s
he
l
l lib
r
aries in
t
o
valgrind d
i
rectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-17
Jeff King
t
/
Makef
i
le: pass test opts to valgrind tar
g
et p
r
operly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-17
Junio
C Hamano
Me
r
ge branch 'ab
/
i18n
-
scrip
t
s-basic'
commit
|
commitdiff
|
tree
2011-06-17
Brandon Casey
sh-i
1
8n
-
-envs
u
bst
.
c: do not
#
inclu
d
e ge
t
o
p
t
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-16
Dmitry
I
vankov
Fix
t
ypo: exist
a
n
t
-
>existent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-16
Junio C Hama
n
o
G
it 1
.
7
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Jonatha
n
Nieder
g
i
twe
b
:
d
o not mi
s
parse nonnumer
i
c content tag files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Junio C Hamano
Git 1
.
7
.
6-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Junio C Hamano
Merge br
a
n
ch
'maint'
commit
|
commitdiff
|
tree
2011-06-09
Jim Meye
r
ing
fetch: do not leak a refspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-07
Junio
C Hamano
Me
r
ge b
r
anch 'jc/magic-
p
athspec
'
commit
|
commitdiff
|
tree
2011-06-07
Alex Rie
s
e
n
t
3
703: skip m
o
re
tests using colons in f
i
le names on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-06
J
u
n
io C H
a
mano
M
e
r
ge branch 'jn/mime-typ
e
-with-params'
commit
|
commitdiff
|
tree
2011-06-06
Junio C
Hamano
Mer
g
e branc
h
'
jn/
g
itweb-docs'
commit
|
commitdiff
|
tree
2011-06-06
Juni
o
C Haman
o
Merge branch 'jk/diff-n
o
t
-
so-quic
k
'
commit
|
commitdiff
|
tree
2011-06-06
Junio C H
a
mano
M
erge br
a
n
ch 'bc/maint
-
st
a
tus-z-to
-
use-p
o
rcelain'
commit
|
commitdiff
|
tree
2011-06-05
Jakub Nare
b
sk
i
gitweb: Fix usability of
$
pr
e
vent_xss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-03
Jakub Narebski
gitweb: Move
"
R
e
q
uirem
e
nts" up
i
n gi
t
web/I
N
STALL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-02
Ja
k
ub Narebski
g
itweb: De
s
c
r
i
b
e CSSMIN
and JSMIN in gitwe
b
/INSTALL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-02
Jak
u
b Narebsk
i
gitw
e
b
:
M
ove in
f
ormation a
b
out ins
t
a
llati
o
n from
R
EAD
M
E
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C
Ham
a
no
Sync with 1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
J
un
i
o C Ha
m
ano
Git 1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C H
a
mano
Merge branch 'jk/ma
i
n
t-co
n
fig
-
alias-fix' into
maint
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C
Hamano
Merge branch 'jc/
f
m
t
-req-fi
x
' in
t
o maint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C Hamano
Merge bra
n
c
h 'jk/maint-do
c
s
'
into
m
aint
commit
|
commitdiff
|
tree
2011-06-01
J
unio C H
a
mano
Merge b
r
anch 'jn/doc-re
m
ot
e
-helpers' int
o
main
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C
Hamano
Merge branc
h
'kk/maint-pre
f
ix-in-config-mak' into maint
commit
|
commitdiff
|
tree
2011-06-01
Jim Meyering
diffcor
e
-rena
m
e
.
c: av
o
id s
e
t-but-
n
ot-u
s
ed warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Update
d
ra
f
t release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
J
unio C
H
am
a
no
Merge branch 'jk/form
a
t-patch-am'
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o C Hamano
Merge branch
'jn/doc-rem
o
te-helpers'
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Merge branch 'jk/f
o
rmat-patch-empty-pr
e
fix'
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
Merge bra
n
ch '
a
b
/i18n-
e
nvsubst-doc-fix'
commit
|
commitdiff
|
tree
2011-05-31
J
unio C
H
a
mano
Merg
e
branch 'jc/log-quiet-f
i
x'
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io
C
H
amano
Merge branch 'kk/maint-prefix-in-config-mak'
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Hamano
Merge branch 'jk/reba
s
e-head-r
e
flog'
commit
|
commitdiff
|
tree
2011-05-31
J
un
i
o C Hamano
Merge
bran
c
h 'jk/m
a
int-docs'
commit
|
commitdiff
|
tree
2011-05-31
Junio
C H
a
mano
M
er
g
e
bran
c
h
'
j
k/read-in-f
u
ll-stops-on-err
o
r'
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C
H
amano
Merge b
r
anch
'jk
/
maint-remote-mirror-s
a
fer'
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Ham
a
n
o
Merge b
r
anch 'jl/re
a
d-t
r
ee-m-dry-run'
commit
|
commitdiff
|
tree
2011-05-31
J
u
n
io C Hamano
Sync with m
a
int
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C H
a
m
ano
Start 1
.
7
.
5
.
4 draft
r
elease note
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ha
m
ano
Merge branc
h
'
tr/add-i-no-escape' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
H
amano
M
e
rge branch 'v
h
/config-interactive-singlekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Mer
g
e b
r
anch 'm
l
/test-readme' into maint
commit
|
commitdiff
|
tree
2011-05-31
J
unio C Hamano
Merge branch 'a
b
/
i
18n-fi
x
up' into maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio
C Hamano
Merge branch 'jc/r
e
name
-
de
g
ra
d
e-cc
-
t
o-
c
' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C Hamano
M
e
rg
e
branch 'r
r
/doc-content-type
'
into
maint
commit
|
commitdiff
|
tree
2011-05-31
Ra
m
say Jones
conf
i
g
.
c: Remove u
n
used git_confi
g
_global()
f
unction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
diff
:
fu
t
ureproof "stop feeding the back
e
nd early"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Jeff Ki
n
g
dif
f
_
t
re
e
:
di
s
able QUICK optimization with di
f
f filter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
a
m
ano
M
erge branc
h
'
jc/f
m
t-req-f
i
x'
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge bra
n
c
h 'jk/maint-config-alias-fix'
commit
|
commitdiff
|
tree
2011-05-30
Jonathan
N
ieder
Docu
m
entation: d
o
not misinterpret refs
p
e
cs as bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Je
f
f King
f
orm
a
t-patch: make zero-length subje
c
t prefix
e
s prettier
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Ævar Arnfjör
ð
B
jarmason
g
i
t-sh-i18n--envsubst:
add SYNOPSIS se
c
tion to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Junio C Ham
a
n
o
Merge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2011-05-30
Junio C
H
amano
Merge branch 'jm/ma
i
nt-misc-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge
b
ran
c
h 'bc/maint-submodule-fix-parked' into maint
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io
C Hamano
Mer
g
e branch 'bc
/
maint
-
api-doc-parked' int
o
maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge
branch 'mk/grep-pcre'
commit
|
commitdiff
|
tree
2011-05-30
M
i
chał Kiedrowicz
git-grep:
F
ix
p
r
o
blems wi
t
h recently ad
d
e
d tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch
'jc/notes-batch-r
e
mova
l
'
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hama
n
o
Merge branch 'jk/haves-fro
m
-alt
e
rnate-odb'
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
Hamano
Merge branch '
j
n/run
-
c
o
m
mand-error-
f
ailure
'
into maint
commit
|
commitdiff
|
tree
2011-05-29
Brandon Cas
e
y
buil
t
i
n/commit
.
c: set status_forma
t
_
a
fter_ option
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-29
Br
a
ndon Casey
t7508: demons
t
r
ate st
a
tus's fa
i
lure to use -
-
porcelai
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-28
Junio C Hamano
log: --quiet
should serve as s
y
nonym to -s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
ing
r
ebase: write a reflog entry when f
i
nishing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Csaba
H
enk
rebase: create
H
EAD refl
o
g entry when abor
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jun
i
o
C
Hamano
config
.
mak
.
in:
all
o
w "
c
onfigure
-
-
sysconfdir=/e
l
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: fix some antique ex
a
mple
o
utput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
King
docs: ma
k
e sure
literal "->" is
n
't converted to arrow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
King
d
ocs: update
s
tatus --porcel
a
i
n format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
J
ef
f
King
docs: minor grammar fixes
to git-st
a
tus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Je
f
f King
f
ormat-patch: preserve subj
e
c
t
n
ewlines with -
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
K
ing
c
l
e
a
n up calling conventions f
o
r pretty
.
c functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff Kin
g
pretty: a
d
d pp_
c
omm
i
t_e
a
sy f
u
nction fo
r
simpl
e
cal
l
e
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
B
rand
o
n Ca
s
ey
g
i
t
-su
b
module
.
s
h:
s
e
parate
p
are
n
s by a sp
a
ce to avoi
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
B
randon Casey
D
ocumentation/techni
c
al/a
p
i-diff
.
txt: corr
e
c
t
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
m
a
i
linfo:
a
lwa
y
s cle
a
n
up rfc8
2
2
h
eader
fol
d
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
t: test sub
j
ect
handli
n
g in f
o
rmat-patch / am
p
ipeline
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff Ki
n
g
r
ead_in_fu
l
l: alwa
y
s report errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
remote: all
o
w "-t" with fet
c
h mirrors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
eff
King
read_gi
t
file_ge
n
tly: use ssize_t
t
o
hold read result
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
remove tests of a
l
ways-fa
l
se condition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
i
m Me
y
e
r
ing
plug a
D
IR buffer l
e
ak
in rer
e
r
e
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
r
erere
.
c: d
i
agnose
a
corrupt
MERGE_RR when
h
itti
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
a
m
an
o
U
p
date
1
.
7
.
6 draft rel
e
ase not
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hamano
Merge
branch 'jn/
u
serdiff-perl-updat
e
s'
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Ham
a
no
Merge branch 'rg/no
-
gecos
-
i
n
-pwent'
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e branch
'
j
k
/fetch-mark-compl
e
te-op
t
imization'
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge b
r
anch 'jn/git
w
eb-js'
commit
|
commitdiff
|
tree
next