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
diff --che
c
k: honor conflic
t
-
m
a
rker-size
attri
b
ut
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerer
e
:
honor confl
i
ct-marke
r
-
s
ize attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
rerere:
prepare for custo
m
i
z
able con
f
lict
marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
co
n
flic
t
-marker-size: new attrib
u
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere:
us
e
ll_m
e
r
g
e() in
s
tead
o
f using x
d
l_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
merge-t
r
e
e
: use ll_merge()
n
ot xdl_mer
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io
C
H
a
man
o
xdl
_
m
erge(): allow pa
s
sin
g
down mark
e
r
_
size in
x
mparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
xd
l
_merge():
i
ntr
o
duce xmparam_t f
o
r merge spec
i
fic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
g
i
t_attr(): f
i
x f
u
nction signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio
C
H
am
a
no
rerere forget path: forget recorded res
o
lution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
r
er
e
r
e:
r
efactor rer
e
re logic to
m
ake it independen
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
rerere: remove silly 102
4
-byte li
n
e
l
imit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Haman
o
resolve
-
undo:
te
a
ch "update-index -
-
u
nresolve
"
to use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
resolve-un
d
o: "ch
e
ckout -m path" u
s
es resolve-
u
ndo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C H
a
mano
resolve
-
undo
:
a
llow plumb
i
ng to clear the information
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Ha
m
ano
reso
l
ve-undo
:
bas
i
c tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C Hamano
re
s
olve-u
n
do: re
c
o
rd resolve
d
conflicts in a new i
n
d
e
x
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io
C
H
amano
b
u
i
lt
i
n-merge
.
c:
use standard
a
c
ti
v
e_cache
m
acros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio C
H
a
mano
Git
1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C
H
amano
Merge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
Prevent git blame f
r
om segfa
u
lting on a mi
s
sing author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Git 1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C H
a
mano
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2009-12-20
Björ
n
G
ustavsson
r
e
base -i:
abort cle
a
n
ly i
f
the ed
i
tor
fails to
launc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
S
t
ephen
Boyd
tech
n
ic
a
l-docs: do
c
u
m
ent ha
s
h API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Step
h
en Boyd
api-strbu
f
.
txt: fix typos a
n
d document launch_editor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
u
n
i
o C Hamano
M
e
rge branch 'maint' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Ham
a
n
o
Git
1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Haman
o
worktree:
don't se
g
fa
u
lt w
i
th an absolute pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Jeff K
i
ng
i
gno
r
e
u
n
k
n
own color configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johannes Sixt
h
elp
.
auto
c
orrect: do not run
a
command if t
h
e comma
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
N
an
a
ko
S
hira
i
sh
i
Ill
u
strate "filt
e
r" attribute with a
n
example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
B
j
örn G
u
stav
s
s
o
n
bash:
Supp
o
rt n
e
w 'git fetch' opti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C H
a
mano
U
pdat
e
Releas
e
Notes for 1
.
6
.
6
to remove o
l
d bu
g
fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
S
y
nc with
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
F
ix archive format wi
t
h -- on the command line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
Hamano
Remove po
s
t-u
p
l
o
ad-hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git 1
.
6
.
6-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Mer
g
e git://repo
.
or
.
c
z/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C
Hamano
Merge
g
it://git
.
kern
e
l
.
org/
p
u
b
/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
U
pd
a
te draf
t
release notes t
o
1
.
6
.
6 before -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Merge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
r
g
e
branch 'mm/maint-mer
g
e
-
f
f-error-message-f
i
x'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
Ha
m
a
n
o
M
erge branch
'jn/maint-pull-rebase-
e
rror-
m
essage'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
rge branch 'jk/mai
n
t-
a
dd-p-delete-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
am
a
no
Me
r
ge
git:/
/
git
.
bogomips
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Revert recent "git merge
<msg> HEAD <co
m
mi
t
>
.
.
.
" deprec
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
a
dd
-
inter
a
c
tiv
e
: fix
del
e
tion of
n
on-empt
y
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
SZED
E
R Gábor
bash: update '
g
it commit' co
m
pletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hama
n
o
Syn
c
wit
h
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torv
a
lds
Fix diff
-
B/--dirsta
t
mi
s
counting of n
e
wly added contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jef
f
K
ing
res
e
t: imp
r
ov
e
worktree safety valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
Docu
m
en
t
ation: Avoid use of
xmlt
o
-
-stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Re
n
é Sc
h
arfe
arc
h
iv
e
: cla
r
ify
d
e
scription of path p
a
r
ameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
r
e
r
e
re: don't
s
egfault on
f
ailure to open rr-cach
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hama
n
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Pr
e
pa
r
e
fo
r
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Mer
g
e br
a
nch 'uk/mai
n
t-
s
hortl
o
g-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Mer
g
e b
r
anch 'fc/maint-format-
p
atch-paths
p
ec-da
s
h
e
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Hamano
M
e
rg
e
branch 'ap
/
m
aint-merge-strateg
y
-list-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
M
e
r
g
e
br
a
n
ch '
j
c/
m
aint-am-keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge
b
ranch 'rs/
w
ork-around-grep-opt-
i
nsa
n
i
ty' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
er
g
e
b
r
a
n
ch '
r
j
/
m
a
int-cygwin-count-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Ham
a
no
Merge
b
ranch
'
mm/
m
aint-hi
n
t-failed-merg
e
' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hama
n
o
Merge branch 'th/mai
n
t-remote-update-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
Hamano
Merge br
a
nch
'
rj/main
t
-t9700' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Ha
m
ano
Merge branch
'
ls/main
t
-
mailinfo-no-inb
o
dy' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hama
n
o
Merge br
a
nch
'
mo
/
maint-crlf-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge branch 'th
/
re
m
o
te-usage' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch 'pb/maint-use
-
c
u
stom-perl
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mm/
c
onfig-path
n
ame-tilde-exp
a
nd' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h '
b
c/g
r
ep-
i
-F'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Hamano
Merge bran
c
h 'jk/ma
i
nt
-
brea
k
-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Mer
g
e branc
h
'rj/maint-simpl
i
fy-cy
g
win-makefile' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C Hamano
Merge bran
c
h 'rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
amano
M
e
rge branch 'np/maint-sideb
a
nd-favor-st
a
tus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Narebski
gitweb: Describ
e
(possible) gitweb
.
js
m
inification
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentation: xml
t
o
0
.
0
.
18 does not kn
o
w --s
t
ri
n
g
p
ar
a
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
ohan Herland
Fix crasher on e
n
counter
i
n
g
SHA1-like n
o
n-note in notes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
B
r
a
n
d
on Casey
t9001: use
o
lder Getopt::
L
ong
b
oolean prefix
'
--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Br
a
ndon C
a
sey
t4201: use ISO
8
859-1 rather than ISO-
8
859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Kr
ü
ger
p
u
ll:
clar
i
f
y advice fo
r
the
u
n
configur
e
d error case
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
Junio
C
Haman
o
U
nconditionally
s
e
t man
.
base
.
url
.
for
.
re
l
ative
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io
C
H
a
mano
Git 1
.
6
.
6-rc
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
von
Brand
g
i
t-p
u
ll
.
sh: Fix
call to g
i
t
-
merge
f
o
r new
c
ommand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C Haman
o
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prepar
e
for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
merge: do not a
d
d stand
a
rd mes
s
age
w
he
n
m
e
ssage is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C Hamano
Do
no
t
mis
i
dentify "git merge foo HEAD" as an old-st
y
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update dr
a
ft release
n
ote
s
t
o
1
.
6
.
6 before
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
n
i
o C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch 'jc
/
deprecate-old-syntax-fr
o
m-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
mano
g
i
t-merge: a
d
eprecation
noti
c
e of the ancie
n
t
c
ommand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
Merge branc
h
'bw/remot
e
-get-ref-s
t
a
t
es-fix
'
commit
|
commitdiff
|
tree
2009-12-01
Bert We
s
arg
get_ref_states
:
strdup e
n
tri
e
s and
f
ree util in stale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next