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
documentation: git-bisect (help HTML break man)
2005-12-02
Juni
o
C Hamano
documentation: git-bise
c
t
(help HTML break man)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
g
it-merge docu
m
entati
o
n: confl
i
cting merge leaves
h
igher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
me
r
ge-o
n
e
-
file: make
sur
e
we
d
o
not misme
r
ge symbolic
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Juni
o
C Ha
m
a
no
m
e
r
ge-one-file: ma
k
e
s
ure we create
t
he m
e
rged fi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
J
u
n
io C Ha
m
ano
t310
0
: add ls-tree
-
t
a
n
d
-d tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Ha
m
ano
merge-recursive: adju
s
t git-
l
s-tree
u
se
fo
r
the
l
at
e
st
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-02
Junio C Hamano
git-merge-one-fi
l
e: do not worry about 'r
m
dir -p
'
not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Juni
o
C Hamano
l
s
-tree: --
n
ame-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Hamano
l
s-tree: res
u
rrect '-d' to mean 'show trees on
l
y'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio C Ha
m
an
o
Make
f
ile: say the defau
l
t
t
arget upfront
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-12-01
Junio
C Haman
o
Documen
t
ation:
d
esc
r
ibe '-f' optio
n
to git-fe
t
ch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Ham
a
n
o
M
e
rge branch '
j
c/subdir
'
commit
|
commitdiff
|
tree
2005-11-30
Ju
n
io C H
a
man
o
M
e
rg
e
b
ranches 'jc/apply', 'lt/ls-
t
ree', 'lt
/
bi
s
e
ct
.
.
.
commit
|
commitdiff
|
tree
2005-11-30
J
u
nio C Ham
a
no
Tut
o
rial: adj
u
st m
e
rge example
to recu
r
sive strategy
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hama
n
o
merge-rec
u
rsive: match the unm
e
rge
d
index e
n
try beha
v
i
our
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Jun
i
o C Hamano
diff-files: sho
w
diffs with stage0 and unmer
g
ed s
t
age
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-30
Junio C Hamano
git-diff: do n
o
t turn off -p/-M
with any diff option
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio
C
H
a
mano
Merge
h
ttp://
w
ww
.
kerne
l
.
org/pub
/
scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio
C
Hamano
format
-
patch
:
run diff in C locale
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
fo
r
mat-
p
atch: do not
a
b
use 3-dash
m
arke
r
line
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Haman
o
f
ormat-patch: remove applies
-
to
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ha
m
a
no
applypatch:
u
s
e
"
index" lines not "a
p
pli
e
s-to"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C Hamano
apply
m
box:
typofix to enable
-
m
op
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Ham
a
no
hash-object
.
c: type-fix to squelch compiler warni
n
gs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hama
n
o
defin
e
die() f
o
r scripts that use it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
mano
verify-t
a
g: make it operable fr
o
m a subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
tag:
m
ake it operable from a subdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
uni
o
C
H
amano
lost-found: make it oper
a
b
le from a sub
d
ire
c
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Hamano
branch: make it o
p
erab
l
e f
r
om
a
su
b
d
i
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
a
m
ano
ls-remote: def
i
ne
d
ie() now
we do
not us
e
git-sh-
s
e
t
u
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Ha
m
ano
count-obje
c
ts:
make it oper
a
ble from
a subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
amano
Make the res
t
of com
m
ands work from a subdir
e
c
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
Ham
a
no
M
a
k
e
n
e
two
r
kin
g
c
o
mma
n
ds to work from
a
sub
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
a
m
a
n
o
ls
-
tree: w
o
rk from subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
u
nio C Ham
a
n
o
ha
s
h-object:
w
ork wi
t
hin subdir
e
ct
o
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
checkout-inde
x
: work from s
u
bdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hamano
fsc
k
-obje
c
ts: work from
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
amano
peek-remote: honor pr
o
xy
c
o
n
fig
e
ven from subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Hamano
git-app
l
y: work f
r
om subdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C Haman
o
working
f
rom subdi
r
ectory:
prepara
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
J
unio C Hamano
bi
s
e
ct: qu
o
te pa
t
h
names
f
or
eval
safe
t
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C
H
ama
n
o
ls-tree
:
mat
c
h the
t
est to the new semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Ju
n
io C Hama
n
o
l
s
-tree:
Resurrec
t
fu
n
ny name
q
uoting lost during rewrite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Jun
i
o C Hamano
wri
t
e_
n
ame_q
u
oted(): make one
o
f
the path
a
counted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Juni
o
C
H
a
mano
Docu
m
ent
a
ti
o
n: De
s
cribe merge operat
i
on a bit
better
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-29
Junio C H
a
m
a
no
name-rev:
fix parent
cou
n
ting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
rebase: one safety n
e
t, one b
u
gfix and on
e
optimiz
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o
C
H
a
m
a
no
M
e
rge h
t
tp:/
/
www
.
kernel
.
org/pub/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2005-11-28
Junio C Hamano
g
it-mv: qu
o
te
$
sr
c
i
n regexp properly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C Hamano
[PATCH
]
g
i
tk: Use i18n
.
comm
i
t
encoding confi
g
u
r
ation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Ju
n
io
C Hamano
config
.
c: con
s
tne
s
s tightening to av
o
id compi
l
a
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C Hamano
ma
i
l
i
nfo: D
o
not use -u=<en
c
oding>; s
a
y --encoding
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Jun
i
o C Haman
o
mailinfo: Use i18
n
.
commitencoding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
J
un
i
o C Hama
n
o
m
a
i
l
info: allow -u
t
o fall back o
n
lati
n
1 to
utf8
c
onversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-28
Juni
o
C Hamano
Introduce i18
n
.
commitencoding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
u
nio
C Hamano
M
erge http://www
.
k
er
n
el
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2005-11-27
Junio C H
a
mano
setup_gi
t
_di
r
e
c
tory(
)
: ch
e
c
k
repository
f
ormat version
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C Hamano
init-db: check t
e
mplate an
d
repository format
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
Junio C H
a
mano
Check reposi
t
ory format version in enter_repo()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-27
J
unio C Hamano
Repository f
o
rmat v
e
rsion check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C
Hamano
format-patch: output filename reported to stdou
t
verba
t
im
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
Junio
C
Hamano
name-rev: fix off-by-one erro
r
in --
s
tdin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-26
J
u
nio C Hamano
she
l
l
.
c: complain on
insu
f
ficient arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
i
o
C
H
a
m
ano
git-
s
h-setup:
m
o
ve the re
p
ository check to
a
cor
e
program
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Hamano
setup
_
git_directory
:
make
sure GIT_DIR is a valid repo
s
i
tory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C
Hamano
git-v
a
r: make
it work in subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio
C Hamano
git-s
h
-setup
:
die if outside git repo
s
itory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
J
u
n
io
C Hamano
parse-remote and ls-rem
o
te clean-
u
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Ju
n
io C Haman
o
Prevent "git-commi
t
-a
pa
t
h1 pat
h
2
.
.
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-25
Junio C Hamano
config
.
c:
a
void shadowing global
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
diff-tree: teach single
-
c
ommit
di
f
f-tree
to
h
onour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio
C Hamano
Teach u
p
date-index to r
e
a
d
from ls-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Juni
o
C H
a
mano
git-revert: make --edit default
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Juni
o
C Hamano
git-merge: make
recur
s
i
ve the default strategy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-24
Junio C Hamano
pack
-
r
e
dundant:
t
ype
cleanups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
J
un
i
o
C
Ha
m
ano
M
e
rge http:/
/
ww
w
.
k
e
r
nel
.
org/pu
b
/
s
cm
/
gitk/gitk
commit
|
commitdiff
|
tree
2005-11-22
Junio C Ham
a
no
git-var: constness and g
l
obalnes
s
cleanup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-22
Junio
C H
a
mano
Mo
v
e diff
.
rename
l
i
mit out of default
c
onfigu
r
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio
C
Hamano
git-proxy updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
J
u
nio C
Hamano
daemon: further tweaks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C H
a
m
a
no
tutorial:
s
e
tt
i
ng up
a tree for
subsyst
e
m maintainers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
rename detection with -M100 means "ex
a
ct
r
enames only"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Jun
i
o C Ham
a
no
f
orma
t
-pat
c
h: fix two-argu
m
ent sp
e
cial cas
e
, and ma
k
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Fix hooks
/
update templa
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C H
a
ma
n
o
Make sure heads/foo and tags/foo do
n
ot
c
onfu
s
e
t
hings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-21
Junio C Hamano
Fix "do not DWIM" patch to enter
_
repo"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio C Hamano
Me
r
ge http://www
.
kernel
.
org/pub/
s
cm
/
gi
t
k
/
gitk
commit
|
commitdiff
|
tree
2005-11-20
J
u
nio
C
Ha
m
ano
m
erge-one-file: use
r
m
di
r
-
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
J
u
nio C Hamano
D
o
cumentation: add
h
ook
s
/up
d
ate example
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Junio
C
Hamano
Do not D
W
IM in u
s
erpath lib
r
ary
under s
t
ri
c
t
m
o
d
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
J
unio C Hamano
http
.
c: reorder to av
o
id compilation failure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Ju
n
i
o C Hamano
me
r
ge-recursiv
e
::removeF
i
le: remove empty
d
irectories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
J
unio C
H
amano
m
e
rge-
o
n
e-fil
e
: remove em
p
t
y directories
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-20
Ju
n
io C Ham
a
no
Documentation: r
e
bas
e
-from-inter
n
al mi
n
or updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C H
a
mano
g
it-repack: d
o
not d
o
c
o
mp
l
e
x redundancy check
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
J
u
nio C Haman
o
git-
c
o
u
nt-objec
t
s: dc replacemen
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C Hamano
readrefs: grab all ref
s
with o
n
e call to
ls-rem
o
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-19
Junio C H
a
ma
n
o
Merge http://www
.
kernel
.
o
rg/pub/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2005-11-18
Junio C
H
a
mano
Me
r
ge branche
s
'jc/branch' and
'jc/rebase'
commit
|
commitdiff
|
tree
2005-11-18
Junio C Hamano
Rewrite rebas
e
to
u
s
e git-format
-
patch piped
to git-am
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next