diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:51:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:51:05 -0800 |
| commit | 620b89cd98219db33ce499c7f8e50d091fe9b598 (patch) | |
| tree | 0838749541fdf9f5fe36466bddc6d3d4167a0248 /builtin/push.c | |
| parent | Merge branch 'aa/status-hilite-branch' (diff) | |
| parent | get_sha1: teach ":$n:<path>" the same relative path logic (diff) | |
| download | tgif-620b89cd98219db33ce499c7f8e50d091fe9b598.tar.xz | |
Merge branch 'nd/extended-sha1-relpath'
* nd/extended-sha1-relpath:
get_sha1: teach ":$n:<path>" the same relative path logic
get_sha1: support relative path ":path" syntax
Make prefix_path() return char* without const
Conflicts:
sha1_name.c
Diffstat (limited to 'builtin/push.c')
0 files changed, 0 insertions, 0 deletions