repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
unpack-trees.c: look ahead in the index
2010-01-07
Junio C Hamano
un
p
a
ck-trees
.
c
:
look
a
head
i
n
the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C
H
a
mano
unpack-trees
.
c
:
pr
e
pare f
o
r lookin
g
ahea
d
i
n the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
Aggressive three-way m
e
rge: fix D/F cas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Jun
i
o C
Hama
n
o
traverse_
t
ree
s
():
handle D/F conflict case sanely
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Ju
n
i
o C
Hamano
m
o
re D/F con
f
lict tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
J
u
nio C Hamano
tests: move conv
e
ni
e
nc
e
regexp to ma
t
c
h
object names
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C H
a
ma
n
o
Git
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-22
Dav
i
d
R
eiss
Prevent git blame from segfaulting on a
missing
a
uthor
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C Hamano
G
it 1
.
6
.
6-r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
J
u
n
io C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-20
Björn
Gustavsson
re
b
ase -i: a
b
ort cleanly if
the edito
r
fails t
o
lau
n
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boy
d
technical-docs: document hash API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen
B
oyd
ap
i
-
strbuf
.
txt: fix
t
ypos and do
c
ument l
a
un
c
h_edi
t
or()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
6-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Merge
branch 'maint' t
o
sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio
C
H
a
m
ano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio C Haman
o
workt
r
e
e: don't se
g
f
a
u
lt
w
it
h
a
n
abs
o
l
u
t
e
pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff Ki
n
g
i
gnore unknown color confi
g
uration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Johann
e
s Sixt
help
.
autoco
r
r
ect: do not run a command if the command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nan
a
ko Shiraishi
Illustrate "fil
t
er" at
t
ribute with
a
n
example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björn G
u
stavsson
bash: Support ne
w
'git fetch' option
s
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 t
o
r
emove ol
d
bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C Hamano
S
y
n
c
w
i
t
h
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
H
amano
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ha
m
ano
Fix
archive format with
-
- on the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C Hamano
Remov
e
p
ost-upload
-
hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C Ha
m
ano
Git 1
.
6
.
6
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Ha
m
a
no
M
e
rg
e
git://repo
.
o
r
.
c
z/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
n
o
M
erge gi
t
://git
.
kernel
.
o
r
g
/pub/scm/gi
t
k
/
gi
t
k
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Ha
m
an
o
Update draft
r
elease not
e
s to 1
.
6
.
6 before
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
M
e
rge branc
h
'
mm/maint-merge-ff-error-messag
e
-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
r
g
e
b
ranch 'jn/mai
n
t-pull-rebase-error-messa
g
e' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
ni
o
C Hamano
Mer
g
e
b
ranch 'jk/maint-add-p-delete-fix' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
r
ge
g
it://git
.
bogomips
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2009-12-08
Junio C H
a
ma
n
o
Revert recent "git merge <msg> HEAD <commit>
.
.
.
"
d
eprecatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Je
f
f
King
add-i
n
te
r
a
c
tive: f
i
x
d
eletion of
non-
e
mpty f
i
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER Gábor
bash: update 'git commit' co
m
plet
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Sync with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C Ham
a
no
Gi
t
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Lin
u
s
Tor
v
alds
Fix diff -B/--dirsta
t
m
i
scounting of
n
ewly added cont
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jef
f
King
reset: impr
o
v
e
workt
r
ee safet
y
valve
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zul
l
inge
r
Docum
e
n
t
a
tion: Avoid use
o
f xmlt
o
-
-
s
tringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Re
n
é
Scharfe
a
rchive: clarify descript
i
o
n
of pa
t
h p
a
ra
m
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
re
r
ere: don'
t
segfault on failure t
o
open
r
r-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Prepare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch 'uk/ma
i
n
t-shortl
o
g-en
c
od
i
n
g
' in
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch
'
fc
/
ma
i
nt-forma
t
-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o
C
Hamano
Merge bra
n
ch 'ap/maint-merge-strategy-list-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Haman
o
Merge branch
'
j
c
/maint-
a
m
-keep' i
n
to
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch 'rs/work-around-g
r
ep-o
p
t-
i
nsanit
y
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch 'rj/main
t
-cygwin-count-o
b
j
ects' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch 'mm/
m
a
int-hint
-
failed-me
r
g
e' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
ma
n
o
M
e
rg
e
branch 'th/mai
n
t-rem
o
te-update
-
help-strin
g
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
Ham
a
no
M
erge b
r
an
c
h 'rj/maint-t9700' in
t
o
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'ls
/
maint-mail
i
nfo-
n
o
-
i
nbod
y
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
Me
r
g
e
branch 'mo/maint-crlf-doc'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
H
amano
Merge branch
'
th/remote-usage' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
am
a
no
Merge branc
h
'pb/maint-use
-
c
ust
o
m-p
e
rl' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge branch 'mm/co
n
fig-pathname-ti
l
de-
e
xpand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch
'bc/grep
-
i
-
F
' into
maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Ha
m
ano
Merge branc
h
'jk/m
a
in
t
-br
e
ak-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Mer
g
e branch '
r
j/ma
i
nt-simplif
y
-cygwi
n
-makef
i
le' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Hamano
Merge branch 'r
g
/
d
oc-workf
l
ow'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch 'np/m
a
int-
s
ideban
d
-favor
-
status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Narebsk
i
gitweb: Describe (p
o
ssible) gi
t
web
.
j
s mi
n
ification
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
n
o
Documentation:
xmlto 0
.
0
.
18 does not know --str
i
ngparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jo
h
an
H
erland
F
ix crasher on e
n
co
u
ntering SHA1-like non-note in n
o
tes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brand
o
n
C
a
s
ey
t9001
:
use older Getopt::Long boolean prefix '-
-
no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t4201: use
I
SO8859-1 rat
h
er than I
S
O-8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pull: c
l
arify advice for th
e
unc
o
nfigured error
c
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io 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
H
amano
Git
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Un
c
onditionally set man
.
ba
s
e
.
url
.
f
or
.
r
e
lative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Do
c
u
m
entation/
M
akef
i
le: allo
w
man
.
base
.
ur
l
.
f
o
r
.
relati
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Haman
o
Git
1
.
6
.
6-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
H
o
rst H
.
von Brand
git-pull
.
s
h: Fix call to git-merge for new c
o
mmand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
ano
M
erge branch
'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Prepare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
merge: do no
t
add standard
m
e
ssage when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ham
a
no
D
o
no
t
misidenti
f
y
"
git
m
erge foo HEAD" as an ol
d
-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Ham
a
no
U
p
dat
e
draft re
l
e
ase notes to 1
.
6
.
6 before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch 'jc/deprecate-ol
d
-syntax-from-me
r
ge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git-me
r
ge: a de
p
r
ecation notice of t
h
e a
n
cien
t
c
o
mmand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Merge branch
'
b
w
/remo
t
e-get-ref
-
states-fi
x
'
commit
|
commitdiff
|
tree
2009-12-01
Bert
W
esarg
get_ref_states: strdup entries an
d
free uti
l
in stale
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
Aguilar
hel
p
: D
o
not
unnecessaril
y
look
f
or a repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
Documentation: Fix a f
e
w i
.
e
.
/e
.
g
.
m
ix-u
p
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C
H
am
a
n
o
Merge branch 'jn/gitweb-bla
m
e
'
commit
|
commitdiff
|
tree
2009-12-01
Ja
k
ub N
a
rebski
g
itweb: Add lin
k
t
o
other
bla
m
e im
p
le
m
entation in
b
lame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jakub Narebski
gitweb: M
a
ke linking to actions requiring
J
avaScript
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge br
a
n
ch 'fc/maint-format-patch-pathspec-dash
e
s'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
M
erge branch
'm
m
/
maint-merge-f
f
-
e
rro
r
-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
Merge
b
r
anch 'ap/ma
i
nt-merge-strate
g
y-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
Merge bra
n
ch 'jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
M
erge
b
ranch 'cc/bisect-
d
oc'
commit
|
commitdiff
|
tree
next