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
merge-tree: use ll_merge() not xdl_merge()
2010-01-17
Junio
C Hamano
mer
g
e-tree: us
e
ll_merge() not xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): allo
w
passing down marker_size in xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hama
n
o
xdl_merge(): introd
u
c
e
xmparam_t f
o
r mer
g
e
specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Hamano
g
it_at
t
r(
)
:
fix fu
n
c
t
ion signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Ju
n
io C Hamano
rerere forget path: forge
t
recorded
r
esolution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio C H
a
mano
rerere: refactor
rerere logic to
make it indepe
n
dent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
rerere
:
remove si
l
l
y 102
4
-byte li
n
e li
m
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
resolve-undo:
t
ea
c
h "update-index
-
-
u
nresolve" to use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C
H
amano
res
o
l
ve-undo:
"
checkou
t
-
m path" uses resolve-undo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
reso
l
ve-undo: allow plumbing to cl
e
a
r the
in
f
ormation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
r
esolve-undo: basic tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
re
s
o
lve-undo:
r
e
cord resolved conflicts in a
new index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
b
u
ilti
n
-merg
e
.
c:
u
se
stan
d
ard active_cache macros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio C H
a
mano
G
i
t 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
J
u
nio C H
a
m
a
no
Me
r
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-22
Davi
d
Reiss
P
revent gi
t
blame fro
m
segfaulting
on a m
i
s
sing autho
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
J
u
ni
o
C
Hama
n
o
Git 1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-20
Björn Gustavsson
rebase -i
:
a
b
ort c
l
eanly if
t
he editor fai
l
s to
launch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen
Boyd
technical-docs: document
hash API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
api-str
b
uf
.
txt: fix typos
a
nd document launch_editor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
unio C Hamano
G
it 1
.
6
.
6
-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Ham
a
no
M
e
rge branch 'maint'
t
o
sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio C Hamano
Git 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 s
e
g
f
ault with
an absolute pathspe
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Je
f
f King
ign
o
re unknown c
o
lor
c
o
nfig
u
r
at
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johann
e
s S
i
xt
help
.
aut
o
correct: do not run
a c
o
mm
a
n
d
if the command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shi
r
aishi
I
llustrate "filter" attribute with an e
x
amp
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Björ
n
G
u
s
tavs
s
on
bash: Sup
p
ort
n
ew 'git fetch' 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
t
o
r
emove o
l
d bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
J
unio C Ha
m
ano
Sync with 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
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
H
a
m
ano
Fix archive forma
t
with
-
- on the command line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
mano
Remove post-upload
-
hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C Ham
a
no
Git 1
.
6
.
6-
r
c
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Merge gi
t
://
r
epo
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Merge git://git
.
kernel
.
or
g
/pub/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
amano
Update dra
f
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
Merg
e
branch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
r
ge branch '
m
m/maint-merge-ff-error-
m
essage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
uni
o
C Ha
m
ano
Merge
branch 'jn/
m
aint-pu
l
l
-
r
ebas
e
-erro
r
-messa
g
e' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Ham
a
no
M
e
rge bra
n
ch 'jk/
m
ain
t
-add-p-delete-fix' int
o
maint
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio
C
H
a
mano
Me
r
ge git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio
C
Hamano
Revert recent "git merge <msg> HEA
D
<commit>
.
.
.
" depreca
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-i
n
teractive:
f
ix dele
t
ion o
f
non-empt
y
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
S
Z
EDER Gábor
b
a
sh: up
d
at
e
'git commit' com
p
l
e
tion
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
Junio C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
L
inus Torval
d
s
Fix
d
iff -B/--di
r
stat
m
i
s
c
ou
n
tin
g
of n
e
wl
y
ad
d
ed contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: impr
o
ve w
o
rk
t
ree
s
afety valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
Doc
u
mentation
:
Avoid
u
se of
x
ml
t
o -
-
st
r
ingparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Re
n
é Sc
h
arfe
ar
c
hive: clarify description
of path
p
a
ram
e
te
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff Kin
g
rerere
:
don't segfault on failure to open r
r
-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Pr
e
pare for
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'u
k
/m
a
int-shortlog-encodi
n
g
'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
Merge b
r
anch
'
f
c/m
a
int-format-pat
c
h-pathspec-
d
ashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge br
a
n
ch '
a
p
/mai
n
t
-me
r
ge-stra
t
egy-lis
t
-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hama
n
o
Merge branch 'j
c
/
mai
n
t-am-keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
er
g
e branch 'rs/work-arou
n
d-grep-opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-
c
ygwin
-
count-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mm/maint-hint-failed-m
e
rge'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
ano
Merge bran
c
h '
t
h/m
a
int-remote-updat
e
-h
e
lp-stri
n
g
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge branch '
r
j/maint-t9700' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Hamano
Merge
branch 'ls/mai
n
t-mailinf
o
-no-inbody
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
ama
n
o
Merge
branch 'mo/main
t
-crlf-
d
oc'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
r
g
e branch 'th
/
remote-
u
s
age' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge br
a
nch 'pb/maint-us
e
-custom-per
l
' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C Hamano
Merge branc
h
'mm/con
f
ig-path
n
ame-tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch '
b
c/grep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
er
g
e branch 'jk/maint-b
r
eak-ren
a
me-r
e
duce-memor
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Ha
m
a
n
o
Merge bran
c
h 'rj/ma
i
nt-si
m
plify
-
cy
g
win-makefile' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge
b
ranch 'rg/doc-workflow' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'n
p
/
maint-si
d
eband-fav
o
r-st
a
tus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jaku
b
Narebski
gitweb
:
Describe (
p
ossible) gitw
e
b
.
js minification
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
H
a
mano
Do
c
ume
n
tatio
n
: x
m
lto 0
.
0
.
18
d
oes no
t
know --stri
n
gparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Johan
Herland
Fix crasher
o
n encounter
i
ng SHA1-li
k
e no
n
-note in notes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brando
n
Casey
t9001
:
use older Getopt::Long boolean pre
f
ix '
-
-
n
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
B
r
a
ndon Casey
t4201: use ISO8859-1 rather t
h
an ISO-8859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pul
l
: cl
a
rify advice for
the u
n
c
o
n
f
igu
r
e
d error cas
e
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
J
unio C H
a
mano
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Unconditiona
l
l
y
se
t
man
.
base
.
u
rl
.
for
.
re
l
ative
.
link
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
G
i
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
g
it-pull
.
sh
:
Fix c
a
ll
t
o
g
i
t-merge for new command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
ano
M
e
r
ge
b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
P
repare 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 not add stan
d
ard message w
h
en mes
s
age is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Do
n
ot misidentif
y
"git merge foo HEA
D
" as an
o
l
d
-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
U
pdate draft release notes to 1
.
6
.
6 b
e
fore -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
am
a
n
o
Me
r
ge branch 'j
c
/
d
epre
c
ate-old-syntax-fr
o
m-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git-merge: a
d
e
p
recation
n
otice of the an
c
ient co
m
m
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
Mer
g
e branch 'bw/remot
e
-
get-
r
ef-states
-
fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert W
e
sarg
g
e
t_ref_state
s
: s
t
rdup entries
and free
util in stal
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
elp: Do not unnecessarily look
for
a reposi
t
ory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Mich
a
el J
Gru
b
er
D
ocumentati
o
n
:
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 H
a
ma
n
o
Merge branc
h
'jn/git
w
eb-bl
a
me'
commit
|
commitdiff
|
tree
2009-12-01
Ja
k
ub N
a
re
b
ski
gitweb: Add link to o
t
her
b
lame im
p
lementation in bla
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jakub
N
arebski
gi
t
web: Make linking t
o
act
i
ons req
u
iri
n
g JavaScr
i
pt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next