repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
revert: clarify label on conflict hunks
2010-03-21
Jonathan
N
i
e
der
reve
r
t: clar
i
fy label
o
n
confl
i
ct hunks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
tha
n
N
i
eder
co
m
pat: add mempc
p
y()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
check
o
ut -m --
c
o
nflict
=
diff3
:
add a lab
e
l for ance
s
tor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
m
erge
_
trees(): add
a
n
c
e
stor
l
abel parameter
f
o
r
diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
th
a
n Nieder
me
r
ge_file(): add co
m
ment
e
xp
l
aining behavior wrt conf
l
ict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout --
c
onflict=di
f
f3
:
add a
l
a
b
el
f
o
r
ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_mer
g
e(): add
ancestor la
b
el para
m
ete
r
for dif
f
3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
ieder
merge-file --di
f
f3: add a label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
x
d
l_merge():
move file1 a
n
d file2 labe
l
s to xmparam
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
xdl_merge(): add optional anc
e
s
t
or
l
ab
e
l t
o
diff3-
s
tyl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
tests: document cherry
-
pick beh
a
vior in face of conflict
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
ede
r
te
s
ts: docume
n
t
f
ormat of co
n
flicts from
c
heckout
-m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Ham
a
no
Up
d
ate
d
raft release notes
t
o 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio
C Hamano
Merge bra
n
ch 'jk/ma
i
nt-add-i
g
nored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Hamano
Merge
b
ranch 'ml/c
o
l
o
r-gr
e
p
'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
Merg
e
b
ranch 'jc/color-attrs'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
i
o C H
a
mano
Merge branch 'cc/r
e
set-ke
e
p'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
M
erge branch 'fl/
a
s
k
pass'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hamano
M
e
rge branch 'b
g
/appl
y
-f
i
x
-
blank-at
-
e
of'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io
C
H
aman
o
M
e
r
ge branch 'bw/union-merge-refacto
r
'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
i
o C Hamano
Merge b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update draft rel
e
ase notes to 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andre
a
s Grue
n
bacher
fetch: Fix mino
r
m
e
mory leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
ndreas Gruenbache
r
fetch: Future-proof initialization of a refspec on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andr
e
as Gru
e
nbacher
fetch: Check for a "^{
}
" su
f
fix with suffixcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Benjamin
C Meyer
Fi
x
a
s
pelling mis
t
ake in a git
-
p4 console message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernhar
d
t
Use test_expect_succ
e
ss
f
or test setups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Imre De
a
k
d
aemon: parse_host_
a
nd_port
SIGSEGV if po
r
t i
s
s
p
ecifi
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonat
h
an
N
ie
d
er
Makefile: Fix occa
s
iona
l
GIT-CFLAG
S
breakage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jon
a
than N
i
eder
M
a
kefile:
F
i
x CDPATH prob
l
em
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
r
and
o
n
Casey
notes
.
c:
r
e
m
ove inappropriate call to
return
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Stephen
B
oyd
pull: replace u
n
nec
e
ssar
y
sed invocation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hamano
Merge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-17
Thomas R
a
st
Documentati
o
n: re
c
eive
.
den
y
Curren
t
Branch
defaults to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ian Ward Comfo
r
t
bash:
c
o
m
p
lete *_HE
A
D r
e
fs i
f
pres
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-03-15
Michael
J G
r
ube
r
Documenta
t
i
o
n/git-
r
ead-t
r
ee: clarify
2-tree m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Mic
h
ael J Grub
e
r
Documentation/git-read-tree: fix table layout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
J
unio C
Haman
o
Merge
branch 'sd/format-patch-to'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hama
n
o
Merge
br
a
nch 'tc
/
h
t
tp-cl
e
anu
p
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
H
amano
Merge branch 't
c
/tra
n
sport-ver
b
osity'
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io C Hamano
Merge branch 'ld
/
push-porcela
i
n'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
H
a
m
ano
Merge branch 'jh
/
notes'
commit
|
commitdiff
|
tree
2010-03-14
Jun
i
o C Hamano
t
e
sts for "git add igno
r
ed-dir/
f
i
le" without -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jeff
K
ing
d
i
r: fix COLLECT_I
G
NO
R
ED on exclu
d
ed pre
f
ixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Ju
n
i
o C
Hamano
t0050:
mark non-worki
n
g test as s
u
ch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
u
n
i
o C Haman
o
Merge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2010-03-14
D
ave O
l
s
z
ewski
d
on't
use defau
l
t revision if a rev was spec
i
fied
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René Scharfe
for_each
_
rec
e
nt_re
f
l
og_ent(): use strbuf, fix offset
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Juni
o
C Hama
n
o
t/Mak
e
file: remove test artifacts
u
p
on "
m
ake
clean"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René Sc
h
a
r
f
e
blame
:
fix indent of lin
e
numbers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
Merge
g
it://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-03-13
Jun
i
o C Hamano
Me
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t5516: Use test_
c
mp when appro
p
riate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-12
Junio C H
a
mano
t9400: Use test_cmp when appropriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Ha
m
ano
Merge branch 'sd
/
in
i
t-templa
t
e'
commit
|
commitdiff
|
tree
2010-03-10
Juni
o
C Hamano
Merge bran
c
h 'sh/am-keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio C
H
amano
Merge bra
n
c
h
'
cp/a
d
d-
u
-pathspec'
commit
|
commitdiff
|
tree
2010-03-10
Juni
o
C Haman
o
Makefile: update c
h
eck-docs t
a
rget
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
Merge br
a
n
c
h 'lt
/
d
eepe
n
-builtin-sour
c
e'
commit
|
commitdiff
|
tree
2010-03-09
J
unio C Ha
m
ano
Docu
m
entation: impro
v
e descriptio
n
of "git res
e
t -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
S
tephen B
o
yd
send-email
:
add --no-cc, --n
o
-to, and --no-bcc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
fo
r
mat-pat
c
h: add --n
o
-c
c
, -
-
no
-
to
,
and --no-add-
h
eader
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
S
t
ephen Boyd
format-pat
c
h
:
use a s
t
ring_list f
o
r headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Update draft release notes
to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
J
unio C Hamano
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2010-03-08
Junio C Haman
o
Merge accumulate
d
f
ixes 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
M
e
r
g
e branch 'mw/maint-
g
cc-warns
-
unu
s
ed-wr
i
te
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
mano
M
e
rge branch 'fn/ma
i
nt-mkdte
m
p-compat' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Me
r
ge branch 'gb/maint-subm
o
dule-env' into maint
commit
|
commitdiff
|
tree
2010-03-08
J
un
i
o C Hamano
Merge branch 'as/
m
ain
t
-expi
r
e'
i
n
to maint
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C Hamano
Merge
b
ranch 'm
l
/maint-grep-doc' into maint
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io C Haman
o
Merge b
r
anch 'jk/ma
i
nt-push
-
tr
a
cking-wo-
r
emote' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hamano
Merge branch 'j
c
/fetc
h
-param
'
int
o
main
t
commit
|
commitdiff
|
tree
2010-03-08
J
unio C Ha
m
a
no
M
erge b
r
a
nch 'ne/
p
ac
k
-lo
c
al-doc' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C
H
aman
o
Merge branc
h
'jk/mai
n
t
-
a
d
d--in
t
erac
t
i
ve-delete' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
unio C Ha
m
a
n
o
Merge branch 'mm/mks
t
emp
s
-mode-f
o
r-pac
k
file
s
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
e
rge branch 'jc/maint-fix-mailinfo-strip'
into ma
i
n
t
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hamano
Merge branch 'jc/grep-author-all-
m
atch-
i
mplicit' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Hamano
Merge
branch 'jc/che
c
kout-det
a
c
hed' into maint
commit
|
commitdiff
|
tree
2010-03-08
J
un
i
o
C
Hama
n
o
Merge branch 'm
a
int-
1
.
6
.
6'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Mark Lodato
grep: Col
o
rize selected, context, and functi
o
n li
n
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
M
ark Lodato
grep: Coloriz
e
fil
e
name,
l
i
n
e
n
u
m
b
er, an
d
separator
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge br
a
nch 'jc/maint-fix-test
-
pe
r
m' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
unio
C
Hamano
Merge
branch 'sp/m
a
int-pus
h
-side
b
and
'
in
t
o maint-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
io C Ha
m
a
n
o
Merge branc
h
'hm/main
t
-imap-send-crlf'
i
nto main
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
mano
Merge b
r
a
n
ch 'g
f
/maint-sh-setup-nongit-ok' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Ha
m
ano
Merge
b
r
anch 'jk/maint-rmd
i
r-fix' i
n
to main
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
amano
Merg
e
branch 'r
s
/optim-text-wr
a
p' into
ma
i
n
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
Merge branch 'tr/mai
n
t-cherry-pick-list' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
Merge br
a
n
c
h 'cc/maint
-
bisect-pa
t
hs' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C
H
ama
n
o
Merge
branch 'mw/maint-gcc-war
n
s-un
u
s
e
d-write'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge branch 'as/maint-expire'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge b
r
anch 'ml/maint-grep-doc'
commit
|
commitdiff
|
tree
2010-03-07
J
unio C
H
amano
Merg
e
branch
'fn/maint-mkdtemp-
c
ompat'
commit
|
commitdiff
|
tree
2010-03-07
J
unio C
Ha
m
a
no
Merge branc
h
'gb/maint-submodule-e
n
v'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Ham
a
no
Merge b
r
anch 'n
e
/
p
ac
k
-
l
oc
a
l-doc'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
Merge branch '
m
b
/
s
ho
r
tlog-nong
i
t-stdin'
commit
|
commitdiff
|
tree
2010-03-07
J
u
ni
o
C
Ha
m
ano
Merge branch 'j
k
/maint-push-t
r
a
c
king-wo-remote
'
commit
|
commitdiff
|
tree
2010-03-07
J
unio C
H
am
a
no
Merge branch
'
jc/fe
t
ch-para
m
'
commit
|
commitdiff
|
tree
next