repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: move the global obuf to struct merge_options
2008-09-05
Mi
k
los Vajna
m
erg
e
-r
e
cursive: m
o
ve
the global obuf
t
o
struct merge_opt
i
ons
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajna
mer
g
e-recursive
:
get rid of the in
d
ex_only g
l
obal
v
ariab
l
e
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
m
e
rge-
r
e
c
ursive: m
o
ve call_depth to struct merge_options
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vaj
n
a
cherry-pick/revert: ma
k
e
d
i
r
ect in
t
ernal call to merge_tree()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajna
b
u
iltin-m
e
rge: avo
i
d
run_c
o
mma
n
d_v_opt
(
) for recursive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
merge
-
recursive: introduce merge_options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Stepha
n
B
e
y
e
r
me
r
ge-recu
r
sive
.
c:
A
dd
mo
r
e generic merge_recursive_generic()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
S
plit out m
e
rge_recursive()
t
o merge-re
c
ursiv
e
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
M
e
rge
b
ranch 'mai
n
t
'
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C Hama
n
o
gitatt
r
ibut
e
s
: -crlf is not binary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C H
a
man
o
gi
t
-app
l
y: Loosen "ma
t
ch_begin
n
ing
"
logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Hamano
Fix exa
m
p
le in
git
-
name-rev documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io C
Hamano
Merge
branch 'sp/mi
s
s
ing-t
h
i
n-base' into mai
n
t
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge bran
c
h 'sb
/
daemon'
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C Hamano
Merge branch
'af/m
a
i
nt-install
-
no-handlink' i
n
to
m
a
i
n
t
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
shell:
d
o
n
ot play dup
l
ica
t
ed definition games
to shrink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
A
lex Rie
s
en
Fix use of hardlinks i
n
"make install"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Haman
o
Merge branch 'np/verify-
p
ack' into maint
commit
|
commitdiff
|
tree
2008-08-29
Junio C
Hamano
Me
r
ge branch
'
m
aint'
commit
|
commitdiff
|
tree
2008-08-29
Tor Arvid
L
und
git-p4:
Fix
che
c
kout bug
w
hen u
s
ing
-
-import-l
o
c
al
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Ciarrocchi
tutori
a
l:
g
ent
l
er illustra
t
io
n
of
Alice/Bob workflow
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Jeff K
i
ng
pretty=format: re
s
pect d
a
te format opt
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Pao
l
o
B
o
nzini
make git-
s
hell paranoi
d
about
c
l
o
se
d
s
td
i
n/stdo
u
t/stderr
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Ya
n
n
D
i
r
son
Documen
t
gitk --argscmd
flag
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
L
in
u
s
T
orvalds
Fix '
-
-
dirstat'
w
i
th cross-directory ren
a
mi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Björn
Steinbrink
for-each-
r
ef: Allow a
t
railing slash in
t
he pattern
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
l
i
st_c
o
m
mands: only call git_exec_
p
ath
i
f it
is needed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Ale
x
Riesen
Allow git
hel
p
work witho
u
t PATH set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x Riesen
M
a
ke main_cmds an
d
other_cmds local to bu
i
ltin
-
help
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex R
i
es
e
n
Remove useles
s
memset o
f
sta
t
ic command name lists
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remove calculation of the longest
c
omma
n
d name f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Bra
n
don Ca
s
ey
di
r
.
c: Avoid c99 array initiali
z
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Ma
t
thias Kestenholz
bash-completion: Add all submodule subcomma
n
ds to the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-28
Junio C
H
aman
o
Merge b
r
an
c
h
'
m
v
/merge-cu
s
t
o
m
'
commit
|
commitdiff
|
tree
2008-08-28
Jun
i
o
C Hamano
M
e
rge branch 'ml/submod
u
l
e'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o
C
H
a
m
ano
Merge
branch 'am/ch
e
rr
y
-pic
k
-rerere'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C
H
amano
Me
r
ge
b
ranch 'jc/add-addremov
e
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ham
a
no
Merge branch 'np/ver
i
f
y
-
p
ack'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Hamano
Merge bra
n
ch 'da/
s
ubm
o
dule-sync'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
ctype
.
c: protect tiny C preprocessor constant
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Linus Torvalds
index-pack: be c
a
reful after
f
ixing
up the header/footer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Simon H
a
usmann
Make it possible to abort the s
u
bmission of a change
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
i
o
C Hamano
Merge
b
ranch 'af/m
a
int-install-no-handl
i
nk
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Haman
o
M
e
rge branch
'
jc/no-sli
m
-
s
hell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge
branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-27
Jeff King
forma
t
-patch
:
u
s
e
default diff
format even with
p
atch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Nguyễn Thái Ngọc Duy
index-pack: set
u
p git reposit
o
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jo
n
es
Suppress som
e
bash redirection error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
R
amsay Jon
e
s
F
ix a warning (
o
n cygwin) to allow -Wer
r
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Andreas
F
ärber
Makefile
:
a
lways provide a
fallba
c
k
when hardlinks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Junio C
H
ama
n
o
daemon
.
c: mi
n
or style fi
x
up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>:
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guilar
git-submodule: add "
s
ync" command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Ha
m
an
o
Revert "Build-in "gi
t
-shell""
commit
|
commitdiff
|
tree
2008-08-25
Jeff King
Fix "git
l
o
g
-
i
--grep"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Tommi Virtanen
Install git-shell in bindir, to
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch 'jc/no
-
sli
m
-shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Hamano
Merge branch 'm
a
int' to
s
ync
w
it
h
1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hamano
G
IT 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Haman
o
Merge
branch
'
ag/maint
-
co
m
b
ine-diff-fi
x
' i
n
to maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
amano
Merge branch 'm
v
/ma
i
nt-merg
e
-
f
i
x
' in
t
o maint
commit
|
commitdiff
|
tree
2008-08-24
M
a
rk Levedahl
git-submodule - Use
"
g
et_
d
efault_remote"
f
ro
m
g
i
t-
p
arse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan
Nieder
Do
c
umentation: clarify
pa
g
er configura
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jona
t
han Nieder
Docume
n
tat
i
o
n
: clarify pager
.
<
c
m
d> configurat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Si
m
on Hausman
n
Clean up the git-p4
d
o
c
u
mentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gavrilov
Respect core
.
au
t
ocr
l
f
in co
m
bined d
i
ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
M
ik
l
os
V
ajn
a
M
akefile:
enab
l
e SNP
R
INTF_RETURNS
_
BOG
U
S for HP
-
U
X
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
t7606
:
fix cu
s
to
m
m
e
r
ge test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Hamano
me
r
g
e
: fix n
u
merus bug
s
ar
o
und "trivial merge" area
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
un
p
ack_tree
s
(): pr
o
tect
t
he handcr
a
fted in-core inde
x
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
To
r
A
r
vi
d
L
u
n
d
git-p4: Fix
o
ne-liner in p4_write_pipe functi
o
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-sub
m
odule: rep
l
a
c
e duplicate
d
co
d
e with
a m
o
dule_lis
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Nicol
a
s Pitre
discar
d
revindex da
t
a when pac
k
list c
h
anges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Da
n
Hensgen
git-mer
g
e docu
m
enta
t
ion: more de
t
ails about resol
v
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Alex Ri
e
sen
Exten
d
"checkout --track" DWIM to s
u
pport
more cas
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
J
onathan del Strother
Rever
t
"Convert output m
e
ssage
s
i
n merge-recu
r
s
i
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Eric Raible
Com
p
letion:
add
m
i
s
si
n
g '=
'
for 'diff --di
f
f-filter'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Ham
a
no
templates/Makefile: install is unnecessary, just u
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Brandon Ca
s
ey
remote
.
c: add a funct
i
o
n
for deleti
n
g a refspec array
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johann
e
s
Sixt
filte
r
-branch: Grok special cha
r
acter
s
i
n
tag n
a
mes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johannes
S
c
h
indelin
test-lib: do not rem
o
ve trash_directory if ca
l
led
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
P
aolo Bon
z
ini
provi
d
e
more error
s
for th
e
"merg
e
into empty h
e
ad
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Shawn O
.
Pearce
Make refl
o
g
query '@{12191
8
8291}' act as '@{2008
.
8
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Neil
R
ob
e
rts
config
.
mak
.
in: Pass
on LDFLAGS from c
o
nfig
u
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
M
a
r
k L
e
v
edahl
git-submodule
.
sh -
Remove
t
railing / from URL if found
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
F
i
x 'git help help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C
H
ama
n
o
Merge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Bra
n
do
n
C
a
s
ey
compat/snprintf
.
c: handle snprintf's that
a
l
w
a
ys return
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Jo
h
an Herland
Te
a
ch "git diff -p"
H
TML f
u
nc
n
am
e
patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Kirill Smelkov
Teach "
g
it diff -p" Python f
u
ncname patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Eric Wong
g
it-svn: fix
d
commit to urls with e
m
bedded usernames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Ham
a
no
M
erge b
r
anch 'ml/
s
ubm
o
d
u
le-foreac
h
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hama
n
o
Merg
e
branch
'
pm/log-exit-code'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge bran
c
h 'sb/comm
i
t-tree-min
i
leak'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
ano
M
e
rge bran
c
h 'pb/re
f
log-dw
i
m'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hama
n
o
M
e
rge b
r
anch 'jc/add-stop-at-symlink'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C
Ha
m
ano
Merge
branch 'kh/diff-tree'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
a
m
a
no
Me
r
ge
b
ranch 'mg
/
co
u
n
t
-
object
s
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
e
r
g
e
b
ranch 'mz/
p
ush-ver
b
ose'
commit
|
commitdiff
|
tree
next