diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-21 23:01:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-21 23:01:45 -0800 |
| commit | 90cee090a0d7f950130d50df123551e43843e679 (patch) | |
| tree | e66cfbfe0f204cd197ad3fef14ef339b828892b7 /revision.c | |
| parent | 4264dc15e198bf9e9a2bb4ee897dd8e3eaabca47 (diff) | |
| parent | fa39b6b5b11f9b580c515a7b4a8e4eb8eaa79b75 (diff) | |
| download | git-90cee090a0d7f950130d50df123551e43843e679.tar.gz git-90cee090a0d7f950130d50df123551e43843e679.tar.xz | |
Merge branch 'master' into jc/fsck-reflog
* master:
Introduce a global level warn() function.
Rename imap-send's internal info/warn functions.
_XOPEN_SOURCE problem also exists on FreeBSD
parse-remote: mark all refs not for merge only when fetching more than one
git-reset --hard: tell the user what the HEAD was reset to
git-tag: support -F <file> option
Revert "git-pull: refuse default merge without branch.*.merge"
Suggest 'add' in am/revert/cherry-pick.
Use git-merge-file in git-merge-one-file, too
diff --check: fix off by one error
Documentation/git-branch: new -r to delete remote-tracking branches.
Fix system header problems on Mac OS X
spurious .sp in manpages
Diffstat (limited to 'revision.c')
0 files changed, 0 insertions, 0 deletions