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
more D/F conflict tests
2010-01-04
Junio C Hamano
m
o
re D/F
conflict tes
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
tests: move convenience regexp to ma
t
ch
object n
a
mes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio
C
Hamano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Jun
i
o C Hamano
Merge
b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
P
revent
git blam
e
f
r
om seg
f
aulting on a
m
issin
g
author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Jun
i
o C Hamano
Gi
t
1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hama
n
o
M
e
rge branc
h
'
m
ai
n
t
'
commit
|
commitdiff
|
tree
2009-12-20
B
jörn Gusta
v
sson
r
e
b
a
se
-i: a
b
ort cleanly
if the editor fai
l
s to l
a
unch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
S
t
ephen Boyd
t
echnical
-
docs: docu
m
ent hash API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
api
-
strbuf
.
txt:
f
i
x typos and document l
a
unch_editor
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Haman
o
Git
1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Merg
e
branch 'main
t
' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Ha
m
ano
Gi
t
1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C Hamano
worktree: don't segfault wi
t
h an absolute pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
ign
o
re unkn
o
wn color configuratio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johanne
s
Si
x
t
hel
p
.
a
u
tocor
r
ect: do n
o
t
ru
n
a command if the
c
omm
a
nd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
N
anako Shira
i
shi
Illu
s
trate
"
filter" att
r
ibute
wi
t
h an
example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Björn Gusta
v
sson
bash: Support new 'git fetch' options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Release Not
e
s for 1
.
6
.
6 to remove
old bugfi
x
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
J
u
ni
o
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
J
unio C H
a
mano
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C Hamano
Fix archive
f
o
rmat with
-- on th
e
command l
i
ne
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Hamano
Remove post-u
p
load
-
hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
uni
o
C Ham
a
n
o
Git 1
.
6
.
6-r
c
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
J
unio C
Hamano
Merge git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge gi
t
://git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Ha
m
ano
Update d
r
aft release
n
otes to 1
.
6
.
6 befor
e
-rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merg
e
b
r
anch 'mm
/
mai
n
t-merge-ff-
e
r
ro
r
-message
-
fix
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
ma
n
o
Merge
branch 'j
n
/ma
i
nt-pull-rebase-error-message' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch
'jk/mai
n
t-add-p-delet
e
-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge git://git
.
bogomips
.
or
g
/
git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C H
a
mano
Revert
r
ecent "
g
it mer
g
e <msg>
HEAD <commit
>
.
.
.
" d
e
precatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
Jeff K
i
ng
a
d
d-interactive:
fix
delet
i
on o
f
n
on-empty
fil
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER G
á
b
o
r
bash: update
'
gi
t
commit' completion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
u
nio C H
a
mano
Syn
c
w
i
t
h
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
H
a
ma
n
o
G
it 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
L
i
nu
s
T
o
rva
l
ds
Fix diff -B/--dirstat miscounting of ne
w
ly a
d
ded
c
o
n
tents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jeff
K
ing
reset:
i
mprov
e
worktree safety va
l
v
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
T
odd Zu
l
linge
r
Documentation:
A
void use
o
f xmlt
o
--stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René Schar
f
e
archive
:
c
l
ar
i
fy desc
r
ip
t
i
o
n of path p
a
ramete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff Kin
g
r
e
rere: do
n
't segfault on
f
ailure t
o
o
p
en rr-cache
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
Ju
n
io C
H
a
m
an
o
Prepare
for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge
branch
'uk/main
t
-
shortlog-encodi
n
g' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
unio C H
a
mano
Me
r
g
e
branch 'fc/maint-format-patch-pa
t
hs
p
e
c
-
d
ashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merg
e
b
r
anch 'ap/ma
i
nt-me
r
g
e-str
a
tegy-li
s
t-fix
'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
erge branch 'jc/ma
i
nt
-
am-k
e
ep' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
H
amano
Mer
g
e br
a
nch 'rs/work-a
r
ound-grep-opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge br
a
n
ch 'rj/maint-
c
ygwin-count-objects
'
in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch 'mm
/
maint-hint-failed-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
M
e
rge
b
ranc
h
'
t
h/maint-rem
o
te
-
update-help-string
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
M
erge
b
ranch
'
rj/mai
n
t
-t
9
700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge b
r
anch 'ls/ma
i
n
t
-
m
aili
n
fo
-
no-inbody
'
in
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch
'mo/
m
a
int-crl
f
-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C Hama
n
o
Merge b
r
anch
'th/remote-usag
e
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'p
b
/maint
-
use
-
cu
s
t
o
m-per
l
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
mm/con
f
ig-pathname-tilde-exp
a
nd
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
ano
Mer
g
e branch 'b
c
/grep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ha
m
an
o
M
erge b
r
anch 'jk
/
maint-brea
k
-rename-reduce
-
m
e
mory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-si
m
plify-c
y
gwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
M
erge br
a
nch 'rg
/
doc-workflow' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C
H
amano
Merge branch 'np/maint-sid
e
band-f
a
vo
r
-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jak
u
b N
a
reb
s
k
i
gitweb: D
e
scribe
(
p
ossibl
e
) gitweb
.
j
s minification
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentation: xmlto 0
.
0
.
18 does not know
--s
t
ringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix crasher on encou
n
ter
i
ng SHA1-like
non-no
t
e in notes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t
9
001: use
older Getopt::Long boolean prefix '--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brand
o
n Casey
t4201: us
e
ISO88
5
9-1 rather
than ISO-8859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pull:
clarify adv
i
ce
for the
unconf
i
g
ur
e
d err
o
r case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
M
erge
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
Unconditionally set man
.
base
.
url
.
for
.
relative
.
l
i
nks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
un
i
o C H
a
mano
G
it 1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
von Brand
git-pull
.
s
h
: Fix
c
all to git-me
r
ge for new co
m
mand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
M
e
rge
branch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o
C Hamano
Prepare for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C Ham
a
no
mer
g
e: do not ad
d
sta
n
dard m
e
ssage when mess
a
ge is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio
C
Hama
n
o
Do no
t
misidentify "git merge
f
oo HEAD" as an old
-
st
y
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
unio
C Ham
a
n
o
Upda
t
e
draft release notes to
1
.
6
.
6 before -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio
C
H
amano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
rge br
a
nch 'jc
/
d
epre
c
ate
-
old-syntax-from-m
e
rge'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Haman
o
git-merg
e
: a deprecation notice of th
e
ancien
t
command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch 'bw/r
e
mote-
g
et-ref
-
states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert Wesarg
get_ref_states: strdup entr
i
es and free util in
s
t
ale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid A
g
uilar
hel
p
: D
o
not unnec
e
ss
a
rily look fo
r
a repos
i
tory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Michael
J
Gruber
Documentation: Fix a
f
ew i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Hamano
Merg
e
bra
n
ch 'jn/git
w
e
b
-blame'
commit
|
commitdiff
|
tree
2009-12-01
Jakub Narebs
k
i
gitweb
:
Add link
to other blame
im
p
l
ementation in blam
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jakub Narebski
gitweb
:
Make linking
to
a
c
tions requiring
J
ava
S
cript
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Merge
branch 'fc/
m
aint-for
m
a
t
-patch-pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
m
a
no
Merge branch 'mm/mai
n
t-me
r
ge-ff-
e
rr
o
r
-
messag
e
-fix'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C Ham
a
no
Merge
b
ranch
'
ap/m
a
int-merge
-
strategy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Haman
o
Merge branc
h
'
j
c/pretty-
l
f'
commit
|
commitdiff
|
tree
2009-11-30
J
un
i
o C Hamano
Merge branch 'c
c
/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hama
n
o
Merge
b
ranch 'em/commi
t
-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branc
h
'jc/mailinfo-re
m
ove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'f
c
/send-email
-
envelope'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ham
a
no
M
e
rge branch '
u
k
/maint-sh
o
rt
l
o
g-encoding
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'ns/send
-
email
-
no-chai
n
-re
p
ly-t
o
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'jc/maint-am-ke
e
p'
commit
|
commitdiff
|
tree
next