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
resolve-undo: "checkout -m path" uses resolve-undo information
2009-12-26
Jun
i
o C Ha
m
ano
r
e
s
o
lve-undo: "
c
hec
k
o
ut -m path" us
e
s resol
v
e
-un
d
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
resolve-undo: allow plumbing to clear the
i
nformati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
ano
reso
l
ve-undo:
basic tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
i
o C
H
a
mano
re
s
olve
-
undo: record
reso
l
ved confli
c
ts i
n
a new
i
ndex
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
bui
l
t
i
n-merge
.
c: use
standard active_cache mac
r
os
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
Ju
n
io
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-22
Da
v
id
R
ei
s
s
Pre
v
ent git
bla
m
e fro
m
segfaul
t
ing o
n
a mi
s
s
ing author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
J
u
nio C Hamano
Git
1
.
6
.
6-rc
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
io C Hamano
M
e
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
B
jö
r
n Gustavsson
r
ebase -i: a
b
ort cleanly
if the e
d
itor fail
s
to
launch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Step
h
en Boyd
t
e
ch
n
ical-docs: document hash
A
P
I
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
a
pi-st
r
buf
.
txt: fix typos and do
c
u
m
ent launch_editor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Ham
a
n
o
Git 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
u
n
io C Hamano
M
e
rge branc
h
'ma
i
nt' 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 H
a
mano
w
orktree
:
d
on't se
g
faul
t
with an abs
o
lute pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Jeff
K
ing
i
gnore unkn
o
wn color con
f
iguration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johan
n
es Sixt
help
.
autocorrect: do n
o
t run a comman
d
if th
e
command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
N
a
na
k
o Shiraishi
Ill
u
s
trate "
f
i
lter" attribute with an
e
xample
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Björn Gusta
v
sson
bash:
S
upport
new
'
g
it fe
t
ch' options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Release Notes for 1
.
6
.
6 to
re
m
ove old bug
f
ixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Juni
o
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 Hama
n
o
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Fix
a
rchive
f
o
r
m
a
t with -- on the com
m
and lin
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
unio
C H
a
mano
Rem
o
ve
p
ost-
u
p
l
oa
d
-
ho
o
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Ham
a
no
Git 1
.
6
.
6-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Merge git://re
p
o
.
or
.
cz
/
git-gu
i
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Merge git
:
/
/g
i
t
.
kernel
.
org/p
u
b/scm/
g
i
t
k/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Update draft
r
ele
a
se notes
t
o 1
.
6
.
6 before
-
rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge
bra
n
ch '
m
a
int'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Me
r
ge branch 'm
m
/main
t
-merge-ff-error-m
e
ss
a
ge-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
M
erge br
a
nch 'jn/
m
ai
n
t-p
u
ll-re
b
ase-
e
rror-
m
es
s
ag
e
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge br
a
nch
'jk/maint-a
d
d-p-
d
el
e
t
e
-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Ham
a
n
o
Merge
g
i
t
://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C
H
amano
Revert
recen
t
"git merge <
m
sg> HEAD <commi
t
>
.
.
.
" deprecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add
-
interactive: fix deletion of non-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: upd
a
te 'git c
o
mmit' completion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C Ham
a
no
S
ync with 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C Haman
o
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torvalds
Fix diff -B/--dirstat
m
iscounting
o
f newly added con
t
ents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: imp
r
ove worktree safety
v
a
lves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinge
r
D
o
cu
m
entation: Avoid use of
x
mlto --stri
n
gparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René Sc
h
arfe
archi
v
e
:
cl
a
rify des
c
ription of pa
t
h pa
r
am
e
t
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff K
i
n
g
rerere: d
o
n'
t
s
e
gfault on failure
to open
rr-ca
c
he
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge
branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Prepare
f
or
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Hamano
M
erge branch 'uk/ma
i
nt
-
shortlog-encodi
n
g' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge b
r
anch
'
fc/ma
i
n
t
-
f
o
rmat-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch
'
a
p/maint-merge-strategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ham
a
n
o
Merge branch 'jc/maint-
a
m
-
k
eep' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'rs/work-around
-
grep-opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge bra
n
ch '
r
j
/maint-cygwin-count-objects' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C H
a
mano
Merge bran
c
h 'mm/maint-hint-failed-merge' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
M
erge branch 'th/maint
-
r
emo
t
e
-
update-help-str
i
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Mer
g
e bra
n
ch 'rj/m
a
int-
t
9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch '
l
s/
m
aint
-
m
ailinfo-no-
i
nbody'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'mo/maint-crlf
-
d
o
c'
i
nt
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C Hamano
Merge branch
'
th/remote-usage'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'pb/m
a
in
t
-use-custom-perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mm/co
n
fi
g
-pat
h
nam
e
-tilde-expand
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merg
e
branch 'bc/grep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
aman
o
Merge branch 'jk/maint-break-ren
a
me-re
d
uce-mem
o
ry'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
no
M
erge branch 'rj/maint-
s
implify-cyg
w
in
-
mak
e
file
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
Hamano
Me
r
ge branc
h
'
r
g/d
o
c-workflo
w
'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Hamano
M
er
g
e br
a
nch '
n
p/maint-sideband-
f
avor
-
status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
akub Narebski
gitwe
b
: Describe
(
possib
l
e)
gi
t
web
.
js minification
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
n
o
Document
a
tion: xmlto
0
.
0
.
18 does
n
ot know --s
t
ringpa
r
am
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
o
han H
e
rland
F
ix crasher on encou
n
tering
SHA1-lik
e
non
-
no
t
e in notes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Bra
n
don C
a
sey
t
9001: u
s
e older Get
o
pt::Long b
o
o
lean prefix '--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Bran
d
o
n
Case
y
t4201: use
I
S
O
8859-1 rather than ISO-8859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
p
ull:
c
lari
f
y ad
v
ice for the unconfigured erro
r
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
i
n 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
ano
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
U
n
conditionally set m
a
n
.
base
.
url
.
for
.
rela
t
i
v
e
.
li
n
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
i
o
C
Hamano
Gi
t
1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
H
orst H
.
von Bra
n
d
git-pull
.
sh
:
Fix ca
l
l to
g
it-merge
f
o
r
new
command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Merge br
a
n
c
h 'mai
n
t
'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prep
a
re for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
merg
e
:
do not add stand
a
rd m
e
s
sage
w
hen message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
ano
Do
not misidentify "git merge foo HEAD" as an old-
s
tyle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update draft release 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 branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-01
J
unio
C
Hamano
M
erge branch 'jc/deprecate-ol
d
-
s
y
n
tax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
git-merge: a d
e
pre
c
ation notice of the a
n
cient comm
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
Merg
e
branch '
b
w
/remote-get-ref-states-
f
ix'
commit
|
commitdiff
|
tree
2009-12-01
Bert
Wes
a
rg
get_ref_states: str
d
u
p
entrie
s
a
nd fre
e
u
t
il in s
t
ale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help:
Do n
o
t
u
nnecessari
l
y look f
o
r
a
repository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Michael J
Gruber
D
o
c
um
e
ntation: Fix a few i
.
e
.
/e
.
g
.
mix
-
ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o
C Hamano
Me
r
ge branch 'jn/gitweb-blame'
commit
|
commitdiff
|
tree
2009-12-01
Jakub Na
r
e
bski
gitweb: Ad
d
link to o
t
h
e
r blame implementation in blame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
akub
N
a
rebski
gitweb: Make
l
i
n
king to actions re
q
uiring J
a
vaScr
i
p
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o C
Hamano
Me
r
ge branch '
f
c/maint
-
f
o
r
mat-
p
atch-pat
h
s
pec-d
a
s
h
es'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio
C
Ha
m
a
no
M
e
rge
branch 'mm/
m
aint-merge-ff-er
r
or
-
mess
a
g
e-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Ham
a
no
Mer
g
e branch
'
a
p
/maint
-
m
erge-strategy-list
-
f
ix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
Me
r
g
e
branch
'jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C
Hamano
Merge branch
'
cc/bis
e
ct
-
d
o
c
'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C
Ha
m
ano
M
e
rge branch 'em
/
commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hama
n
o
M
e
rge branch 'jc
/
mailinfo-remove
-
bra
c
kets'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o C Hamano
Merge
b
ranch 'fc
/
send-email-e
n
velope
'
commit
|
commitdiff
|
tree
next