diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-10-30 18:08:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-30 18:08:58 -0700 |
| commit | 98b35e2c749614446b916230148d66857e8a09f3 (patch) | |
| tree | 3cf15ee4e22a7ebf84e92b019a26ef424d540857 /Documentation/merge-config.txt | |
| parent | Fix potentially dangerous uses of mkpath and git_path (diff) | |
| parent | Use git_pathdup instead of xstrdup(git_path(...)) (diff) | |
| download | tgif-98b35e2c749614446b916230148d66857e8a09f3.tar.xz | |
Merge branch 'ar/maint-mksnpath' into ar/mksnpath
* ar/maint-mksnpath:
Use git_pathdup instead of xstrdup(git_path(...))
git_pathdup: returns xstrdup-ed copy of the formatted path
Fix potentially dangerous use of git_path in ref.c
Add git_snpath: a .git path formatting routine with output buffer
Conflicts:
builtin-revert.c
refs.c
rerere.c
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions