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
tests: document format of conflicts from checkout -m
2010-03-21
Jonath
a
n Niede
r
tests: docum
e
n
t f
o
rmat of conflicts from ch
e
c
kout -m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Upda
t
e draft release notes t
o
1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
Merg
e
br
a
nch 'jk
/
ma
i
nt-add
-
i
g
nored-di
r
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Mer
g
e branch
'
ml/c
o
lor-gre
p
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
m
ano
Mer
g
e branch 'jc/
c
olor-attrs'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
io
C
H
amano
Merg
e
bra
n
ch '
c
c/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
amano
Me
r
g
e br
a
nch 'fl/as
k
pass
'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Ha
m
an
o
Mer
g
e branch '
b
g/appl
y
-f
i
x-blank-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merg
e
branc
h
'
b
w/uni
o
n-me
r
ge-refactor'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o
C
Hamano
Merge branch
'
m
a
int
'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Ha
m
a
no
U
p
date draft release
n
otes to 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
n
dreas Gruen
b
ac
h
er
fet
c
h:
Fix minor memory leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gr
u
enbacher
fetc
h
: Futu
r
e-proof in
i
t
i
a
lization of
a r
e
fspec on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
ndre
a
s
G
ruenbacher
fetch: Check for a "^{}" suffix with
s
uffixcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Benjamin C Meyer
Fi
x
a
s
pel
l
ing
mistake in a git
-
p4 con
s
ole message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernhardt
Us
e
t
e
st_expect
_
success for te
s
t setups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Imre Deak
daemon: parse_ho
s
t_and_port SIGSEG
V
if port is specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonat
h
an Nieder
Make
f
ile: Fix occasio
n
al
GIT-CFLAGS
bre
a
kage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nathan Nieder
Makefi
l
e: Fix CDPATH prob
l
em
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Bran
d
o
n Case
y
not
e
s
.
c:
r
emove i
n
appropriate
c
all to retu
r
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Stephen Boyd
pull: re
p
l
ace unneces
s
ary sed invocation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C
H
aman
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
T
h
om
a
s Rast
Documentation:
r
eceiv
e
.
deny
C
urrentBranc
h
defa
u
lts
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ia
n
Ward Comfort
b
a
sh: compl
e
te *
_
HEAD refs if present
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ju
n
io
C
H
amano
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2010-03-15
Micha
e
l
J Gruber
Docum
e
ntation/git-read-tree:
c
larify 2-tree merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
Documen
t
ation/git-read-tree
:
fi
x
ta
b
le l
a
you
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io C Hamano
Merge branch '
s
d/
f
o
r
mat-pa
t
ch-t
o
'
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io
C
Hamano
Mer
g
e branch 'tc/h
t
t
p
-cleanup
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
Hamano
M
e
rge branch 'tc/transport-verbo
s
ity'
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io C Hamano
Merge branc
h
'ld/push-po
r
c
elain'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C Hamano
Merge branch 'jh/notes
'
commit
|
commitdiff
|
tree
2010-03-14
Ju
n
io C
H
a
ma
n
o
te
s
ts for "git a
d
d ignored-dir/file" without -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jeff Ki
n
g
dir: fix COLLEC
T
_IGNORED on excl
u
ded
p
refixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C
H
am
a
no
t005
0
: mark non-
w
o
rking te
s
t as such
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
u
nio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-14
Dav
e
Olszewski
don't use
defaul
t
rev
i
sio
n
if a rev was s
p
ecified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René
Sch
a
rfe
for_each_
r
ece
n
t_reflog_ent
(
): use str
b
uf
,
fix offset
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
J
unio C Hamano
t
/M
a
k
ef
i
le: remove test arti
f
a
ct
s
u
pon
"make
c
l
e
an
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Re
n
é Scharf
e
blame: fix indent
of
l
in
e
numbers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Ham
a
no
M
e
rge git://git
.
bogomips
.
org
/
g
i
t-s
v
n
commit
|
commitdiff
|
tree
2010-03-13
Juni
o
C Ha
m
an
o
Merge branch
'
main
t
'
commit
|
commitdiff
|
tree
2010-03-12
Junio C Ha
m
an
o
t551
6
: U
s
e test
_
cmp
when appropriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Haman
o
t940
0
:
Use test_cmp when ap
p
ropriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
M
e
rge
branch 'sd/init-tem
p
late'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C
Hamano
Merge br
a
nch '
s
h/am-keep
-
cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C
H
a
mano
Me
r
ge branch 'cp/add-u-pathspec'
commit
|
commitdiff
|
tree
2010-03-10
Junio C
H
amano
Ma
k
efile: update check-docs
tar
g
et
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio
C H
a
m
ano
M
erge b
r
anch 'lt/
d
eepen
-
bui
l
tin-so
u
rce'
commit
|
commitdiff
|
tree
2010-03-09
Junio C Hamano
Documentation:
i
m
p
rove
d
e
s
cription of "git
reset -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephe
n
Boyd
send
-
email: ad
d
--no
-
c
c
, --no-to
,
a
nd --no-bcc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephen
B
oyd
f
o
r
m
at-patch: add --no-cc, --n
o
-to, a
n
d -
-
no-a
d
d-headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Bo
y
d
f
ormat-patch: use a string_list for h
e
a
ders
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C
Hamano
U
p
d
a
te
draft release note
s
to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Me
r
ge
acc
u
mula
t
ed fixes to
prepare for 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge br
a
nch 'mw/maint-gcc-warns-unused-write' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merg
e
branch 'fn/main
t
-mkdtem
p
-comp
a
t'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
erge bran
c
h 'gb/maint-submodule-e
n
v' into main
t
commit
|
commitdiff
|
tree
2010-03-08
Junio C Haman
o
Merge branch
'
as/maint
-
exp
i
re' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-08
J
unio C H
a
m
ano
Merge branch 'ml/
m
aint-gr
e
p-doc' into
m
ai
n
t
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
i
o
C
H
a
mano
Merge
b
ranch 'jk/m
a
i
n
t
-push-tracking-wo-rem
o
te' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
unio
C Hama
n
o
Merge branch 'j
c
/fetch-param'
i
nt
o
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
e
rge
b
ranch 'n
e
/pack-local
-
d
oc' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Me
r
ge
bran
c
h 'j
k
/maint-add--interacti
v
e-delete'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge bra
n
ch '
m
m
/
mkstemps
-
mo
d
e
-
f
or-pa
c
kfil
e
s'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ha
m
ano
M
e
r
g
e bran
c
h 'jc/mai
n
t-fix-mailinfo
-
strip' into m
a
int
commit
|
commitdiff
|
tree
2010-03-08
J
unio C H
a
mano
Merge bran
c
h 'jc/gr
e
p-author
-
all-match-implicit' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge
b
r
an
c
h 'jc/che
c
kout-de
t
ached' i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2010-03-08
J
unio C Hamano
M
e
rg
e
b
r
anch 'maint-1
.
6
.
6
' into maint
commit
|
commitdiff
|
tree
2010-03-08
M
a
rk Lodat
o
gre
p
: Colorize selected, context, and function
lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Mark
L
odato
grep: Colorize fil
e
name, line
number, and
s
e
pa
r
ator
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'jc/
m
aint-
f
ix-tes
t
-perm' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merg
e
branch
's
p
/maint-push-sideband' into mai
n
t
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
un
i
o C
H
ama
n
o
Merge
b
r
anch 'hm/mai
n
t-ima
p
-
s
e
nd-cr
l
f'
into main
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Haman
o
Merge branch 'gf/maint-sh-s
e
tup-nongit
-
o
k'
i
nto
m
ain
t
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
Merge
b
ranch '
j
k/maint-r
m
di
r
-fix'
i
nto maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Haman
o
Mer
g
e bran
c
h 'r
s
/optim-text-wrap
'
into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge
b
ranch 'tr/maint
-
cher
r
y-pick-
l
ist' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
M
e
rge b
r
anch
'
cc/maint-bisect-paths' into mai
n
t-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
a
mano
Merge branch 'mw/maint-g
c
c
-
warns-unus
e
d-write'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
ano
Mer
g
e branc
h
'as/maint-exp
i
re'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
i
o
C Hamano
Merge branch 'ml/
m
aint-grep-doc'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hamano
M
erge bra
n
c
h
'fn/maint-mkdtemp-compat'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
Merge bra
n
ch 'gb/maint-submo
d
ule-env'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io
C
Hamano
Merge branch
'
ne/pa
c
k-loca
l
-
doc'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C
Haman
o
Merge bran
c
h 'mb
/
shortlog-non
g
it-s
t
d
in
'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
Merge b
r
anch 'j
k
/
m
aint-push-tracking-wo-r
e
mote
'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Haman
o
Me
r
g
e b
r
a
n
ch
'
j
c/fet
c
h-pa
r
am'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C
Hamano
Merge branch 'il/lo
o
sen-remote-
h
elper-names'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge b
r
anch 'nd/ro
o
t
-git
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'js/runtim
e
-prefi
x
-t
r
a
ce-not-warn'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
Merge b
r
anch 'm
m
/mkstemps-m
o
de-for-packfil
e
s'
commit
|
commitdiff
|
tree
2010-03-07
J
unio C Hama
n
o
M
erge
branch 'jk/maint-add--interact
i
ve-delete'
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
i
o C Hamano
Merge branch 'jc/mai
n
t
-
fix-maili
n
fo-strip'
commit
|
commitdiff
|
tree
2010-03-07
J
un
i
o C Hamano
color: al
l
ow mu
l
tiple
at
t
r
ibut
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
S
ync with 1
.
7
.
0
.
2
commit
|
commitdiff
|
tree
2010-03-07
Mark L
o
dato
Add
G
IT_COL
O
R_BOLD_* and G
I
T_COLOR_BG_*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
amano
G
it 1
.
7
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Bert Wesa
r
g
unset GREP_OPTIONS
in test-lib
.
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next