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
merge-file --diff3: add a label for ancestor
2010-03-21
Jon
a
than
N
ieder
merg
e
-fil
e
-
-
d
i
ff3: add a la
b
e
l
for anc
e
st
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge(): move
f
ile1 an
d
fi
l
e2 labe
l
s
to x
m
param
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Niede
r
xdl_me
r
g
e(): ad
d
optional ancestor la
b
el
t
o di
f
f3-styl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
tests: document cherry-
p
ick be
h
avi
o
r in
f
ace
of confl
i
cts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
test
s
: docu
m
ent form
a
t of conflicts from check
o
ut
-
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hama
n
o
U
p
date draft rel
e
ase not
e
s to
1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
unio C
Hamano
Mer
g
e
branc
h
'
j
k/main
t
-
add-ignored
-
dir
'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Me
r
ge branch 'ml/col
o
r-grep'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C H
a
mano
Merge bran
c
h 'jc/
c
olo
r
-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
M
e
rge branch 'cc/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Mer
g
e
branch 'fl/askpa
s
s
'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C Hamano
Merge br
a
nc
h
'bg/apply
-
fi
x
-blank-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
J
uni
o
C
H
amano
Merge bra
n
ch 'b
w
/union-me
r
g
e
-
ref
a
ctor'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hama
n
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
ano
Upda
t
e
d
raft release
n
otes t
o
1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gr
u
e
nb
a
cher
fetch: Fi
x
minor memor
y
lea
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas
G
r
uenbacher
fetch: Future-
p
roo
f
initializa
t
i
on
o
f
a ref
s
pec on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenb
a
cher
fetch: Check
for
a "^{
}
" suffix with suffixcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben
j
amin C
M
eyer
Fix a spelling
m
ista
k
e in a git-p4 console messag
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
r
i
a
n
Gernhardt
Use tes
t
_expect_success for test setu
p
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Imre Deak
daemon: pars
e
_
h
ost
_
and_
p
or
t
SIGSEG
V
if
port is
s
pecifi
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
athan Nieder
Makefil
e
:
F
ix occ
a
siona
l
GIT-CFLAGS
b
reakage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
ed
e
r
Makefile: Fix CDPATH p
r
oblem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Br
a
n
don Casey
notes
.
c: remove inappropriate call to
r
eturn
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Stephen Boyd
p
u
ll: replace u
n
necessary sed i
n
vocati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ju
n
i
o C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
Docum
e
ntation:
receiv
e
.
denyCurrentBranch de
f
au
l
ts to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
I
a
n
W
a
r
d C
o
mfort
bash: complete *_H
E
AD refs
i
f
p
resent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Juni
o
C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-15
Mi
c
h
ael J Gruber
Docume
n
t
a
t
ion/git
-
read-tree
:
clarify 2-tree
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Mic
h
ael J Gr
u
ber
Documen
t
ation/
g
it-
r
ead-tree:
f
ix table layout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Jun
i
o C
Hamano
Merge bran
c
h 'sd/form
a
t-patch
-
to'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hama
n
o
Merge
branch 'tc/h
t
tp-
c
leanup
'
commit
|
commitdiff
|
tree
2010-03-15
Juni
o
C
H
ama
n
o
Merge branch
'tc/
t
ransp
o
rt-verbosity
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge b
r
anch 'l
d
/p
u
s
h-porcela
i
n'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
Hamano
Merge branch 'jh/notes'
commit
|
commitdiff
|
tree
2010-03-14
Junio
C Ham
a
no
tests
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
King
d
i
r: fix COLLECT_IGNOR
E
D on exclu
d
ed prefixe
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
unio C Hamano
t0050: m
a
rk non-working tes
t
a
s such
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-14
Dave Olszewski
d
o
n't use default revision if a rev was specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René S
c
har
f
e
fo
r
_each_re
c
e
nt_re
f
l
o
g_ent():
u
se strbuf, f
i
x o
f
f
set
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Juni
o
C H
a
man
o
t/
M
akefile
:
r
em
o
ve
test ar
t
ifacts u
p
on "m
a
k
e
c
l
ean"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René S
c
h
a
rf
e
blame:
f
ix indent of line numbers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Ju
n
io
C Hamano
Mer
g
e git://git
.
bogomips
.
o
rg
/
g
i
t
-s
v
n
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
Me
r
ge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-12
Juni
o
C Hama
n
o
t5516: Use te
s
t_cmp wh
e
n appropri
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-12
J
u
nio C Hamano
t9400
:
U
se t
e
st_cmp when ap
p
ropriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
J
u
nio C Ham
a
no
Merg
e
branc
h
'sd/init-template'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
Merge branch 'sh/am
-
keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
Juni
o
C Hamano
Merge branch 'cp/add-u-paths
p
e
c
'
commit
|
commitdiff
|
tree
2010-03-10
J
u
n
io C Ha
m
an
o
Makefile: up
d
ate c
h
eck-docs target
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio
C Hamano
Merge branch 'lt/de
e
pen-bui
l
tin-source'
commit
|
commitdiff
|
tree
2010-03-09
Junio C Hamano
D
ocumentati
o
n: i
m
prove description
o
f
"git reset -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephe
n
Boyd
send-email:
add --no-cc, --no
-
to, and --no-bcc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Step
h
en Boyd
fo
r
mat-patch: add --no-cc, --no-to, and
-
-no-add
-
headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Ste
p
hen Boy
d
format-p
a
tch: use
a
strin
g
_list
for
h
eaders
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
mano
Up
d
ate draft
r
elease notes to
1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
i
o
C Haman
o
Merge branch
'
m
a
i
n
t
'
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
i
o C Hamano
Merge accumul
a
ted
fixes to
prepar
e
f
o
r
1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C Hamano
M
erge branch 'mw/maint
-
gcc-w
a
rns-unused-write' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
u
ni
o
C Hamano
Merge branch 'fn/maint-mkdt
e
mp-c
o
mp
a
t'
into
m
ain
t
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Me
r
ge branch 'gb/maint-s
u
bmodule-env' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
i
o C Hamano
Merg
e
branch 'as/maint-ex
p
ire
'
into
mai
n
t
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merg
e
branch 'ml/mai
n
t
-
grep-doc' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ha
m
ano
Me
r
g
e
branc
h
'jk/maint
-
push-tracking-
w
o-remote' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
unio C Hamano
M
er
g
e
b
ranch 'jc
/
fetch-param' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-08
Junio C
Hamano
Mer
g
e branch 'ne/pack
-
l
o
c
a
l
-doc' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-03-08
Junio
C Hamano
Merge branch 'jk/maint-add--interactive-de
l
ete' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'mm/mks
t
emps-mode-for
-
pac
k
f
i
le
s
' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C Hamano
Merge branch
'jc
/
maint
-
fix-mailinfo-st
r
ip
'
int
o
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C
H
a
mano
M
e
rge branch 'j
c
/grep-aut
h
or-all-
m
a
tc
h
-implic
i
t'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hama
n
o
Merge branch 'jc/c
h
ec
k
out-detached'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
mano
M
e
r
g
e
branch '
m
aint
-
1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-03-08
Mark
L
odato
grep: C
o
lorize selected,
context, and f
u
nct
i
on lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Mark
L
odato
grep:
Colorize filename, li
n
e number,
a
n
d se
p
ara
t
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C
H
amano
Merg
e
branch 'j
c
/m
a
int
-
f
i
x-test-pe
r
m' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge branch 'sp
/
mai
n
t-push-s
i
deband
'
into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hamano
M
erge branc
h
'
hm/maint-imap
-
s
e
n
d-cr
l
f' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
M
e
rge branch 'gf/maint-sh-
s
etup-nongit-ok' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio
C H
a
mano
M
e
r
ge branch 'jk/main
t
-
rmdir-fix'
i
nto mai
n
t-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch
'rs/op
t
im-text
-
wr
a
p
'
into
m
aint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio
C Hamano
Me
r
ge branch '
t
r
/
maint-c
h
e
r
ry-pick-list
'
int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
aman
o
Merge branch
'cc
/
mai
n
t-bisec
t
-
pa
t
h
s
' in
t
o
maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
unio C
H
a
mano
Merg
e
branc
h
'mw/maint-gcc-warns-
u
nu
s
e
d
-
w
r
ite'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
amano
Merge
branc
h
'
as/maint-
e
xpire'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C Hamano
Merge branch
'
ml/maint-grep-d
o
c
'
commit
|
commitdiff
|
tree
2010-03-07
J
unio C Haman
o
M
e
rge b
r
anch 'fn
/
maint-mkd
t
e
mp-comp
a
t
'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
Merg
e
branch 'g
b
/maint-submodule-env'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'ne/pack-lo
c
a
l-do
c
'
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
io C Ham
a
no
Merge branc
h
'mb/s
h
ortlog-n
o
ngit-stdi
n
'
commit
|
commitdiff
|
tree
2010-03-07
J
u
ni
o
C Hamano
Merge
b
ranc
h
'jk/
m
aint-push-tr
a
c
k
in
g
-wo-remote'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C Hamano
M
er
g
e branch 'jc/fetc
h
-param'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branc
h
'il/loosen-remot
e
-helper-names'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
i
o C
H
aman
o
Merg
e
b
r
a
n
ch
'
n
d
/root
-
git'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
Merg
e
branch '
j
s
/
r
unti
m
e-p
r
efi
x
-trace-not-warn
'
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
i
o C Hamano
Merge branch
'
mm/mkstemp
s
-m
o
d
e
-for-packfi
l
e
s
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge b
r
anch 'jk/
m
ain
t
-add--interact
i
v
e-delete'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'jc/main
t
-fix-mailinfo-s
t
ri
p
'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
color: allow mult
i
p
le attributes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next