repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add builtin merge-file, a minimal replacement for RCS merge
2006-12-06
Johannes Schindelin
Add builtin
merge
-
file,
a mi
n
imal replac
e
ment for RCS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
J
oha
n
nes Schindelin
xdl_
m
erge(): fix
a
nd simplify conf
l
ict handlin
g
commit
|
commitdiff
|
tree
2006-12-03
Johannes Schindelin
x
dl_merge(): fix thin
k
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Johannes Sch
i
ndelin
xdl_merge(): fix an off-
b
y-one bug
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ham
a
no
merge-recur
s
i
v
e: use xdl_merge
(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
xmerg
e
: ma
k
e return v
a
lue fr
o
m xdl_merge() more usable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Joha
n
nes
S
chindel
i
n
xdiff: add xdl_merge()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C H
a
m
ano
M
e
rge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2006-12-03
Eric Wong
git-sv
n
: avoid
f
etch
i
ng files twice i
n
the same
r
evis
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C
Ham
a
n
o
git-merge: fi
x
con
f
usion between tag a
n
d
b
r
anc
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
And
y
Parkin
s
De-emphasise the symboli
c
link documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
Andreas Ericsson
git-diff: Introduce --i
n
dex and deprecate --cached
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
Andr
e
as Eric
s
son
ls-f
i
les:
G
ive hints w
h
e
n errors happen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-30
N
i
colas Pitre
pac
k
-obje
c
ts: remo
v
e redun
d
ent
s
ta
t
us information
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C
Hamano
Merge master
.
kernel
.
org:/pub
/
scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2006-11-29
Junio C H
a
ma
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-11-29
An
d
y Par
k
ins
Documen
t
g
it-repo-config -
-
bool/--int opt
i
ons
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
tutorial: tal
k
about us
e
r
.
n
ame early and don't
s
tart
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Alex Riesen
git-blame:
f
ix rev para
m
e
ter h
a
ndling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Ha
m
ano
Merge branch 'jc/gl
o
b
f
etch'
commit
|
commitdiff
|
tree
2006-11-29
Jun
i
o C
Ha
m
ano
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C Hamano
git blame -C: f
i
x
o
ut
p
ut format twe
a
k
s
when cro
s
sing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git-s
v
n: fix mu
l
t
i
-ini
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Er
i
c
Wong
git-svn: documentati
o
n u
p
dates
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git-
s
vn:
color sup
p
o
r
t
f
o
r the lo
g
c
o
mman
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
H
an-Wen Nien
h
uys
i
dent
.
c: Trim hint print
e
d when gecos
i
s
empty
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pearce
Fix
b
roken bash com
p
let
i
on
o
f local refs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Sh
a
wn O
.
Pea
r
c
e
Tea
c
h
ba
s
h how
t
o compl
e
te lo
n
g options for git-commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric
Wong
git-svn
:
fix out
p
ut reporting from th
e
de
l
ta fetcher
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-svn
:
error o
u
t
w
hen the SVN
c
onne
c
tion f
a
ils during
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
R
e
n
é
S
charf
e
s
hortlog: remove range check
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric
W
o
ng
git
-
svn: upda
t
e tests for
r
e
cent changes
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
E
ric Wong
git-sv
n
: enable
delta trans
f
ers
during fetches wh
e
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Johanne
s
Schindelin
sha1
_
object_
i
nfo(): be
consistent
w
ith read_sha1_file()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
J
ohannes
Sch
i
n
delin
shor
t
log: use pager
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio
C
Ham
a
no
cvsimpor
t
: styl
e
fixup
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Eri
c
Wong
git-svn: use ~
/
.
subver
s
i
on con
f
ig files
w
hen using
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
Pe
a
rce
Teach bash about git-am/git-app
l
y and their
w
hitespace
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Cache
the
lis
t
of merge strategies and avai
l
able comma
n
ds
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Support --
s
trategy=x completion
i
n
addition to -
-
strategy x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pea
r
ce
Teac
h
b
a
s
h
ab
o
ut gi
t
-rep
o
-config
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
Pearce
Supp
o
rt bash c
o
mpletion of refs/remote
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
Pe
a
r
c
e
Teach bash ab
o
u
t
git
log/show/whatchang
e
d options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach
bash how
to complete g
i
t-reba
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
Pearce
Tea
c
h bash how to comple
t
e git-che
r
ry
-
pick
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pear
c
e
Teach bash h
o
w to complete
g
i
t-fo
r
mat-pa
t
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pear
c
e
Add c
u
r
r
e
nt branch in PS1 support to git-completion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
earce
Teach bash how
t
o
compl
e
te options for gi
t
-name-r
e
v
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
ha
w
n
O
.
Pearce
H
ide plumbing/t
r
ans
p
ort commands f
r
om
b
ash completion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
h
awn O
.
Pearce
Teach git-comple
t
i
on
.
bas
h
h
o
w to complete g
i
t-merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Se
a
n
U
p
d
ate
d
ocumentation to remov
e
i
ncorrect GIT_DIFF_OPTS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C
Haman
o
Me
r
ge branch 'js/s
h
ortlo
g
'
commit
|
commitdiff
|
tree
2006-11-27
Junio C H
a
mano
M
erge
b
r
anch 'jc/push-delete-ref
'
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C Haman
o
Merge
b
ranch 'jc/me
r
ge'
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio
C
Hamano
git-mer
g
e:
d
o
not
l
ea
k
rev-p
a
r
s
e output used for checking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
g
i
t-
m
erge: t
i
ghten error checking
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge branch 'jc/
p
ack-peeled'
commit
|
commitdiff
|
tree
2006-11-26
J
unio
C Hamano
grep: do not ski
p
unmerged entries when gre
p
ping in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Han-Wen Nienhu
y
s
git-t
a
g: allow empty tag
m
essage if -m
i
s give
n
explicitly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Junio C Hama
n
o
Merge branch 'jn/web'
commit
|
commitdiff
|
tree
2006-11-26
J
.
Bruce
F
i
elds
Do
c
umentation: clarify tutorial pull/me
r
g
e
d
i
scussion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Jakub Nareb
s
ki
gi
t
w
e
b: Make pr
o
ject descri
p
tion in projects list link
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Eric Wong
git-
s
vn: al
l
ow S
V
N:: lib users to tra
c
k the root of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Nareb
s
ki
g
i
tweb: Use author_ep
o
ch for p
u
bd
a
te in gitweb feeds
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Narebski
g
i
twe
b
: A
d
d author an
d
contribu
t
or email to Atom feed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jaku
b
N
arebski
gitwe
b
: Add
author
and committer email extraction to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jak
u
b Nareb
s
k
i
gitweb: Us
e
git-sho
w
-re
f
ins
t
ead of
git-p
e
ek-remote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jak
u
b
Nar
e
bsk
i
git
w
eb: Do not use
e
sc_html in esc_path
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ham
a
no
fetch-
p
ack: d
o
not barf when duplicate re patterns
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
unio
C Hamano
git-
f
etch: all
o
w forci
n
g glob pattern
in
r
e
f
spec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ha
m
ano
M
e
r
g
e
br
a
nch 'master' into jc/glo
b
fetch
commit
|
commitdiff
|
tree
2006-11-25
J
unio C
H
aman
o
g
it-fetch: exit with non-zero statu
s
w
hen fa
s
t
-
forward
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
Hamano
git-shortlog: make comm
o
n repository pr
e
fix configur
a
b
le
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
Haman
o
gi
t
-s
h
ortl
o
g:
f
ix
common rep
o
s
i
tory
p
refix ab
b
re
v
i
ation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
E
ric Wong
git-svn
:
exit
w
ith status 1
for test failures
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Eric Wong
g
i
t
-s
v
n
:
correctly access rep
o
s w
h
en only
given p
a
rtia
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
unio
C
Hamano
g
it-branch -D: make it work even when o
n
a yet-to-be
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Lars Hj
e
mli
Add -v and --ab
b
rev options to
git-branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ham
a
no
git-clone: stop d
u
mb
p
rotocol from co
p
yin
g
refs outside
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C Hamano
gitweb
:
(style
)
use chomp with
o
ut parenth
e
ses cons
i
s
t
e
n
tly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Jakub Narebski
gitweb
:
Repla
c
e SPC
w
ith also in t
a
g
comme
n
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
io C Ha
m
ano
Allow git push
t
o delet
e
remote
r
ef
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
J
u
n
i
o
C Hamano
Merge bran
c
h 'jn/
w
eb'
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o
C
Hamano
Merge branch 'pb/dif
f
ro
o
t'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge
branch 'jc/
p
ack-heuristics'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge
branch '
j
c/numstat'
commit
|
commitdiff
|
tree
2006-11-24
J
unio C Ha
m
ano
Merge
branch 'ap/branch-ref-di
s
play'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge branch 'ap/prune'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Typef
i
x bu
i
ltin-prune
.
c::pr
u
n
e_object(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Peter Baumann
config opti
o
n log
.
sh
o
wro
o
t to show
t
he
d
iff of root
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hama
n
o
Merge bra
n
ch 'jc/upload-pac
k
'
commit
|
commitdiff
|
tree
2006-11-24
Eric Wong
gi
t
-
sv
n
: handle
a
uth
e
ntication without rel
y
in
g
on
c
ached
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Iñaki Ar
e
naza
gi
t
-
cv
s
i
mport:
a
d
d suppo
r
t for CV
S
p
server m
e
thod HTTP
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Petr B
a
udis
Mak
e
g
i
t-clone --use-separate-remote the defaul
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
H
a
m
a
no
ref
s
outside
r
efs/{he
a
ds,tags} m
a
t
c
h le
s
s strongly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Andy Pa
r
kins
Increase length
of function na
m
e b
u
f
f
e
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C Hamano
git-fet
c
h: allow
glob pattern in
r
efspec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio C Hama
n
o
git-fetch: fix dumb prot
o
c
o
l transport to fetch from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C Ham
a
no
gi
t
-fetch: reuse ls-remote re
s
u
lt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
Eric
Wo
n
g
g
i
t-svn: preserve uncommitted changes after dcommit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next