repo.or.cz
/
git
/
jnareb-git
/
bp-gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
diff --check: honor conflict-marker-size attribute
2010-03-25
Junio C Hamano
d
iff --check: honor c
o
nflict-m
a
rker-size a
t
tribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
re
r
er
e
:
honor c
o
n
f
l
ic
t
-marker-siz
e
attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
rerere: p
r
epare for customizable c
o
nflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
con
f
lict-marker-
s
ize:
n
e
w
a
t
t
ribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
aman
o
rerere: use
ll_merge()
instea
d
of
u
s
ing xdl_m
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
merge-tree: use ll_merge
(
)
n
ot xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C H
a
mano
xdl_mer
g
e():
a
llow
passing down marker_si
z
e in
xmparam
_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C
H
a
mano
xdl_
m
e
rge
(
): intr
o
duce xmp
a
ra
m
_t
for merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C Hamano
git
_
a
ttr(): fix
functi
o
n s
i
gnature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
J
unio C Hama
n
o
rerere forget pa
t
h: forge
t
recorded resoluti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Jun
i
o C
Hamano
r
erere: refa
c
tor
r
ere
r
e logic to m
a
ke
it independent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio
C
H
a
ma
n
o
rerere: remove silly 1024-byte li
n
e limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
res
o
lve-undo: teach "update-index --unresolve" to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
H
a
m
a
n
o
resolve-undo: "
c
hecko
u
t
-
m path" uses resolve-
u
ndo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Ham
a
no
resolve-
u
n
do: allo
w
p
lu
m
bing to clea
r
the
information
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
resolve-und
o
: basi
c
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
r
e
solve-undo:
r
ec
o
rd resolved
conflicts in a
n
e
w index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C
H
amano
builtin-m
e
r
g
e
.
c: use standard
active_cache macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C
H
amano
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C
Hama
n
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-22
David
Reiss
Preve
n
t git blame fro
m
s
e
gfaulting on a mis
s
ing author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C
H
amano
Gi
t
1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C
Hamano
Merge
b
ran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-20
Bj
ö
rn Gust
a
vs
s
on
rebase -i: abo
r
t cleanly if
th
e
e
ditor fails to launch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
technical-docs: doc
u
ment
h
ash
A
PI
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
ap
i
-
s
trbuf
.
txt
:
f
ix ty
p
os and document launch_
e
d
i
tor()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
u
n
i
o
C Hamano
Git 1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
uni
o
C
H
am
a
no
Merge branch 'm
a
int' to sync w
i
th 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
J
unio C Hamano
Gi
t
1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C
Ham
a
n
o
worktree: don't s
e
g
fa
u
lt w
i
t
h
a
n absolute
p
athsp
e
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jef
f
King
ignore unknown color configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Johanne
s
Sixt
help
.
autocorre
c
t: do not
r
un a c
o
mmand if the
c
om
m
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shirai
s
hi
I
l
l
u
strate "fil
t
e
r
" attribute with
an example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
B
jörn Gustavsson
bash: Suppo
r
t n
e
w 'git f
e
t
ch'
opt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Jun
i
o C Hama
n
o
Update Re
l
ease Notes for 1
.
6
.
6 to rem
o
ve old b
u
gfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Sync with
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Haman
o
G
i
t 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io
C Haman
o
Fix archive
f
ormat wit
h
-- o
n
the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Re
m
ove p
o
st-upload-hoo
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C Hamano
Git 1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://repo
.
or
.
cz
/
git-gui
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Merge gi
t
://
g
it
.
kerne
l
.
o
r
g
/
pub/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2009-12-09
Junio
C H
a
mano
Upda
t
e draft rele
a
se not
e
s
t
o 1
.
6
.
6
b
efore -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge
b
ranch 'mm/maint-merge-ff-error-m
e
ssage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
H
amano
Mer
g
e branch
'jn/maint-pull-rebas
e
-
error-mes
s
a
ge' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Haman
o
Merge branch 'jk/maint
-
add-p-delete-fix'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Merge g
i
t:
/
/git
.
bogomips
.
org/git
-
svn
commit
|
commitdiff
|
tree
2009-12-08
Jun
i
o C Hamano
Revert rec
e
nt "git
m
erge <msg> HEAD <com
m
it>
.
.
.
"
d
epre
c
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Jeff Ki
n
g
add-interactive: fix deletion
of non-empty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
SZE
D
E
R Gábor
bash: update 'gi
t
c
omm
i
t' completio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C
Hama
n
o
Sync
w
ith 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
H
amano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
L
i
nus Torvald
s
Fix d
i
ff -B
/
--dirstat miscounting of newly added co
n
tent
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: i
m
prov
e
worktree saf
e
ty valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zull
i
nger
D
o
cume
n
tation: Avoid use of xml
t
o
-
-stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Ren
é
Schar
f
e
archive: c
l
arify description of path parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rere
r
e:
d
on't segfault on
f
a
ilure to o
p
en
rr-
c
a
c
he
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-03
Junio
C H
a
mano
Pr
e
pare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge
branch 'u
k
/
m
aint-shortlog-encoding'
in
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ha
m
ano
Merge branch '
f
c
/
maint-format
-
patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch 'ap/mai
n
t-m
e
rge
-
strateg
y
-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge
bra
n
ch 'jc/ma
i
n
t
-
am
-
keep' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge branch 'rs/work-aro
u
n
d-grep-opt-insa
n
i
t
y' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge bra
n
ch 'r
j
/m
a
int-cygwin-count
-
ob
j
ects' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch 'mm/maint-hint-failed-merge'
i
nt
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C H
a
mano
Merg
e
b
r
anch 'th/
m
a
i
n
t-remo
t
e-update-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C H
a
mano
Merge branch 'rj
/
m
a
int
-
t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch
'
ls/main
t
-mailinf
o
-
n
o
-inbod
y
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
M
e
rge
branch 'mo/maint-
c
rlf-doc' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge branch 'th/re
m
o
te-us
a
ge
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
e
rge bra
n
ch 'pb
/
maint-use
-
custom-perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Hamano
Merge br
a
nch 'mm/config-
p
athname-ti
l
de-exp
a
n
d
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Me
r
ge branc
h
'bc
/
grep-i-F'
into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Hamano
Merge branc
h
'jk/maint-b
r
eak-rename-
r
educe-memor
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C H
a
mano
Mer
g
e br
a
n
c
h 'rj/maint-simp
l
ify-cygwin
-
makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C
Hamano
Mer
g
e
branch
'
r
g
/doc-wo
r
kflow' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Merg
e
branch 'np/maint
-
sideband-fav
o
r-stat
u
s' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
a
kub Nar
e
bski
gitw
e
b: Describe (pos
s
ible) gi
t
w
e
b
.
js mi
n
ifica
t
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Haman
o
Document
a
tion: xml
t
o 0
.
0
.
18 doe
s
not kno
w
--s
t
ring
p
aram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Johan Her
l
and
Fix
c
rasher on enco
u
n
terin
g
SHA1-like n
o
n-note i
n
no
t
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t9
0
01:
us
e
o
lder Getopt:
:
Long boolean
prefix '--no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brando
n
Ca
s
ey
t4201: use ISO8859-1
r
ath
e
r th
a
n IS
O
-8
8
59-
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
an Krüger
p
u
l
l: clarify advice
for th
e
un
c
on
f
igured er
r
or
c
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge in
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hama
n
o
Unc
o
n
ditionally
set man
.
b
a
se
.
url
.
for
.
r
elative
.
li
n
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch
'
maint
'
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Docume
n
t
at
i
o
n
/
M
akefile: allow man
.
ba
s
e
.
url
.
for
.
re
l
ative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hamano
Git 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
H
o
rst H
.
von Brand
git-
p
ull
.
sh: Fix call to git-
m
erge for new
c
o
m
mand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
Prepare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Hamano
me
r
ge: do
not add standar
d
message when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Haman
o
Do not misidentify
"
git merge foo HEAD" as an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Haman
o
Update d
r
af
t
rele
a
se notes to
1
.
6
.
6
be
f
ore -
r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge br
a
nch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio
C
H
a
mano
Merge b
r
an
c
h 'jc/deprecate
-
old-s
y
ntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Hamano
g
it-merge: a
depr
e
cat
i
on notice
o
f th
e
ancien
t
command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next